From c167b5f3a6c25ba4ac912e4eaa07cc509dea7a2c Mon Sep 17 00:00:00 2001
From: Marshall Greenblatt <magreenblatt@gmail.com>
Date: Fri, 22 Jun 2012 19:25:44 +0000
Subject: [PATCH] Fix Mac/Linux compile errors.

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@705 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
---
 cef1/libcef/drag_data_impl.cc          |  4 ++--
 cef1/libcef/sqlite_diagnostics_stub.cc | 16 ++++++++++++++++
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/cef1/libcef/drag_data_impl.cc b/cef1/libcef/drag_data_impl.cc
index c8f83f9b6..00be5e75a 100644
--- a/cef1/libcef/drag_data_impl.cc
+++ b/cef1/libcef/drag_data_impl.cc
@@ -35,11 +35,11 @@ CefString CefDragDataImpl::GetLinkMetadata() {
 }
 
 CefString CefDragDataImpl::GetFragmentText() {
-  return data_.text.is_null() ? CefString() : data_.text.string();
+  return data_.text.is_null() ? CefString() : CefString(data_.text.string());
 }
 
 CefString CefDragDataImpl::GetFragmentHtml() {
-  return data_.html.is_null() ? CefString() : data_.html.string();
+  return data_.html.is_null() ? CefString() : CefString(data_.html.string());
 }
 
 CefString CefDragDataImpl::GetFragmentBaseURL() {
diff --git a/cef1/libcef/sqlite_diagnostics_stub.cc b/cef1/libcef/sqlite_diagnostics_stub.cc
index 128913b69..a5b9fcf85 100644
--- a/cef1/libcef/sqlite_diagnostics_stub.cc
+++ b/cef1/libcef/sqlite_diagnostics_stub.cc
@@ -3,8 +3,24 @@
 // be found in the LICENSE file.
 
 #include "chrome/browser/diagnostics/sqlite_diagnostics.h"
+#include "content/public/common/url_constants.h"
 
 // Used by SQLitePersistentCookieStore
 sql::ErrorDelegate* GetErrorHandlerForCookieDb() {
   return NULL;
 }
+
+namespace chrome {
+
+// Used by ClearOnExitPolicy
+const char kHttpScheme[] = "http";
+const char kHttpsScheme[] = "https";
+
+}  // namespace chrome
+
+namespace content {
+
+// Used by ClearOnExitPolicy
+const char kStandardSchemeSeparator[] = "://";
+
+}  // namespace content