- Update to Chromium revision 165669.

- Fix Linux/OS-X compile errors (issue #751).

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@897 5089003a-bbd8-11dd-ad1f-f1f9622dbc98

CHROMIUM_BUILD_COMPATIBILITY.txt

@@ -17,5 +17,5 @@
 
 {
   'chromium_url': 'http://src.chromium.org/svn/trunk/src',
-  'chromium_revision': '160122',
+  'chromium_revision': '165669',
 }

cef.gyp

@@ -416,14 +416,14 @@
         '<(DEPTH)/media/media.gyp:media',
         '<(DEPTH)/net/net.gyp:net',
         '<(DEPTH)/skia/skia.gyp:skia',
+        '<(DEPTH)/third_party/libxml/libxml.gyp:libxml',
+        '<(DEPTH)/third_party/WebKit/Source/WebCore/WebCore.gyp/WebCore.gyp:webcore',
         '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
+        '<(DEPTH)/third_party/zlib/zlib.gyp:minizip',
         '<(DEPTH)/ui/ui.gyp:ui',
         '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
-        '<(DEPTH)/webkit/support/webkit_support.gyp:appcache',
-        '<(DEPTH)/webkit/support/webkit_support.gyp:database',
-        '<(DEPTH)/webkit/support/webkit_support.gyp:fileapi',
         '<(DEPTH)/webkit/support/webkit_support.gyp:glue',
-        '<(DEPTH)/webkit/support/webkit_support.gyp:quota',
+        '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_storage',
         'libcef_static',
       ],
       'defines': [
@@ -770,13 +770,11 @@
         '<(DEPTH)/third_party/libxml/libxml.gyp:libxml',
         '<(DEPTH)/third_party/WebKit/Source/WebCore/WebCore.gyp/WebCore.gyp:webcore',
         '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
+        '<(DEPTH)/third_party/zlib/zlib.gyp:minizip',
         '<(DEPTH)/ui/ui.gyp:ui',
         '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
-        '<(DEPTH)/webkit/support/webkit_support.gyp:appcache',
-        '<(DEPTH)/webkit/support/webkit_support.gyp:database',
-        '<(DEPTH)/webkit/support/webkit_support.gyp:fileapi',
         '<(DEPTH)/webkit/support/webkit_support.gyp:glue',
-        '<(DEPTH)/webkit/support/webkit_support.gyp:quota',
+        '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_storage',
         # Necessary to generate the grit include files.
         'cef_pak',
       ],
@@ -1000,7 +998,7 @@
     },
   ],
   'conditions': [
-    ['os_posix==1 and OS!="mac" and OS!="android" and gcc_version==46', {
+    ['os_posix==1 and OS!="mac" and OS!="android" and gcc_version>=46', {
       'target_defaults': {
         # Disable warnings about c++0x compatibility, as some names (such
         # as nullptr) conflict with upcoming c++0x types.

cef.gypi

@@ -18,5 +18,15 @@
         'clang_use_chrome_plugins': 0,
       }],
     ]
+  }, 'conditions': [
+    ['OS=="mac" and clang==1', {
+      'target_defaults': {
+        'xcode_settings': {
+          # Temporary workaround for an Xcode 4 build error. This can be
+          # removed with the next Chromium update. See crbug.com/156530.
+          'WARNING_CFLAGS': ['-Wno-unknown-warning-option'],
         },
+      },
+    }]
+  ]
 }

include/capi/cef_download_item_capi.h

@@ -145,13 +145,6 @@ typedef struct _cef_download_item_t {
   // The resulting string must be freed by calling cef_string_userfree_free().
   cef_string_userfree_t (CEF_CALLBACK *get_mime_type)(
       struct _cef_download_item_t* self);
-
-  ///
-  // Returns the referrer character set.
-  ///
-  // The resulting string must be freed by calling cef_string_userfree_free().
-  cef_string_userfree_t (CEF_CALLBACK *get_referrer_charset)(
-      struct _cef_download_item_t* self);
 } cef_download_item_t;
 
 

include/cef_download_item.h

@@ -143,12 +143,6 @@ class CefDownloadItem : public virtual CefBase {
   ///
   /*--cef()--*/
   virtual CefString GetMimeType() =0;
-
-  ///
-  // Returns the referrer character set.
-  ///
-  /*--cef()--*/
-  virtual CefString GetReferrerCharset() =0;
 };
 
 #endif  // CEF_INCLUDE_CEF_DOWNLOAD_ITEM_H_

include/cef_trace_event.h

@@ -184,7 +184,7 @@ CEF_EXPORT void cef_trace_event_end(const char* category,
                                     const char* arg2_name,
                                     uint64 arg2_val,
                                     int copy);
-CEF_EXPORT void cef_trace_event_if_longer_than(long long threshold_us,
+CEF_EXPORT void cef_trace_event_if_longer_than(int64 threshold_us,
                                                const char* category,
                                                const char* name,
                                                const char* arg1_name,

libcef/browser/browser_context.cc

@@ -236,13 +236,15 @@ net::URLRequestContextGetter*
 
 net::URLRequestContextGetter*
     CefBrowserContext::GetMediaRequestContextForStoragePartition(
-        const std::string& partition_id) {
+        const FilePath& partition_path,
+        bool in_memory) {
   return GetRequestContext();
 }
 
 net::URLRequestContextGetter*
     CefBrowserContext::GetRequestContextForStoragePartition(
-        const std::string& partition_id)  {
+        const FilePath& partition_path,
+        bool in_memory) {
   return NULL;
 }
 

libcef/browser/browser_context.h

@@ -37,9 +37,11 @@ class CefBrowserContext : public content::BrowserContext {
       int renderer_child_id) OVERRIDE;
   virtual net::URLRequestContextGetter*
       GetMediaRequestContextForStoragePartition(
-          const std::string& partition_id) OVERRIDE;
+          const FilePath& partition_path,
+          bool in_memory) OVERRIDE;
   virtual net::URLRequestContextGetter* GetRequestContextForStoragePartition(
-      const std::string& partition_id) OVERRIDE;
+      const FilePath& partition_path,
+      bool in_memory) OVERRIDE;
   virtual content::ResourceContext* GetResourceContext() OVERRIDE;
   virtual content::GeolocationPermissionContext*
       GetGeolocationPermissionContext() OVERRIDE;

libcef/browser/browser_host_impl.cc

@@ -301,8 +301,8 @@ CefRefPtr<CefBrowserHostImpl> CefBrowserHostImpl::GetBrowserForHost(
     const content::RenderViewHost* host) {
   DCHECK(host);
   CEF_REQUIRE_UIT();
-  WebContentsImpl* web_contents =
+  content::WebContentsImpl* web_contents =
-      static_cast<WebContentsImpl*>(host->GetDelegate());
+      static_cast<content::WebContentsImpl*>(host->GetDelegate());
   if (web_contents)
     return static_cast<CefBrowserHostImpl*>(web_contents->GetDelegate());
   return NULL;

libcef/browser/browser_main.cc

@@ -8,19 +8,12 @@
 
 #include "libcef/browser/browser_context.h"
 #include "libcef/browser/browser_message_loop.h"
-#include "libcef/browser/content_browser_client.h"
 #include "libcef/browser/devtools_delegate.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/string_number_conversions.h"
-#include "base/threading/thread.h"
-#include "base/threading/thread_restrictions.h"
-#include "content/browser/browser_process_sub_thread.h"
-#include "content/browser/download/download_file_manager.h"
-#include "content/browser/download/save_file_manager.h"
-#include "content/browser/plugin_service_impl.h"
 #include "content/public/browser/gpu_data_manager.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_switches.h"

libcef/browser/browser_settings.cc

@@ -148,19 +148,19 @@ void BrowserToWebSettings(const CefBrowserSettings& cef, WebPreferences& web) {
       cef.universal_access_from_file_urls_allowed;
   web.allow_file_access_from_file_urls = cef.file_access_from_file_urls_allowed;
   web.experimental_webgl_enabled =
-      GpuProcessHost::gpu_enabled() && !cef.webgl_disabled;
+      content::GpuProcessHost::gpu_enabled() && !cef.webgl_disabled;
   web.gl_multisampling_enabled = web.experimental_webgl_enabled;
   web.show_composited_layer_borders = false;
   web.accelerated_compositing_enabled =
-      GpuProcessHost::gpu_enabled() && !cef.accelerated_compositing_disabled;
+      content::GpuProcessHost::gpu_enabled() && !cef.accelerated_compositing_disabled;
   web.accelerated_layers_enabled = !cef.accelerated_layers_disabled;
   web.accelerated_video_enabled = !cef.accelerated_video_disabled;
   web.accelerated_2d_canvas_enabled =
-      GpuProcessHost::gpu_enabled() && !cef.accelerated_2d_canvas_disabled;
+      content::GpuProcessHost::gpu_enabled() && !cef.accelerated_2d_canvas_disabled;
   web.accelerated_painting_enabled =
-      GpuProcessHost::gpu_enabled() && cef.accelerated_painting_enabled;
+      content::GpuProcessHost::gpu_enabled() && cef.accelerated_painting_enabled;
   web.accelerated_filters_enabled =
-      GpuProcessHost::gpu_enabled() && cef.accelerated_filters_enabled;
+      content::GpuProcessHost::gpu_enabled() && cef.accelerated_filters_enabled;
   web.accelerated_plugins_enabled = !cef.accelerated_plugins_disabled;
   web.memory_info_enabled = false;
   web.fullscreen_enabled = cef.fullscreen_enabled;

libcef/browser/content_browser_client.cc

@@ -229,13 +229,19 @@ class CefMediaObserver : public content::MediaObserver {
       int render_process_id,
       int render_view_id,
       const content::MediaStreamDevices& devices) OVERRIDE {}
+  virtual void OnMediaRequestStateChanged(
+      int render_process_id,
+      int render_view_id,
+      const content::MediaStreamDevice& device,
+      content::MediaRequestState state) OVERRIDE {}
 };
 
 
 CefContentBrowserClient::CefContentBrowserClient()
     : browser_main_parts_(NULL) {
   plugin_service_filter_.reset(new CefPluginServiceFilter);
-  PluginServiceImpl::GetInstance()->SetFilter(plugin_service_filter_.get());
+  content::PluginServiceImpl::GetInstance()->SetFilter(
+      plugin_service_filter_.get());
 }
 
 CefContentBrowserClient::~CefContentBrowserClient() {

libcef/browser/cookie_manager_impl.cc

@@ -349,7 +349,7 @@ bool CefCookieManagerImpl::GetCefCookie(const GURL& url,
   std::string cookie_path = net::CanonicalCookie::CanonPath(url, pc);
   base::Time creation_time = base::Time::Now();
   base::Time cookie_expires =
-      net::CanonicalCookie::CanonExpiration(pc, creation_time);
+      net::CanonicalCookie::CanonExpiration(pc, creation_time, creation_time);
 
   CefString(&cookie.name).FromString(pc.Name());
   CefString(&cookie.value).FromString(pc.Value());

libcef/browser/devtools_delegate.cc

@@ -127,6 +127,10 @@ std::string CefDevToolsDelegate::GetPageThumbnailData(const GURL& url) {
   return std::string();
 }
 
+content::RenderViewHost* CefDevToolsDelegate::CreateNewTarget() {
+  return NULL;
+}
+
 std::string CefDevToolsDelegate::GetDevToolsURL(content::RenderViewHost* rvh,
                                                 bool http_scheme) {
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();

libcef/browser/devtools_delegate.h

@@ -31,6 +31,7 @@ class CefDevToolsDelegate : public content::DevToolsHttpHandlerDelegate {
   virtual bool BundlesFrontendResources() OVERRIDE;
   virtual FilePath GetDebugFrontendDir() OVERRIDE;
   virtual std::string GetPageThumbnailData(const GURL& url) OVERRIDE;
+  virtual content::RenderViewHost* CreateNewTarget() OVERRIDE;
 
   // Returns the DevTools URL for the specified RenderViewHost.
   std::string GetDevToolsURL(content::RenderViewHost* rvh, bool http_scheme);

libcef/browser/download_item_impl.cc

@@ -100,8 +100,3 @@ CefString CefDownloadItemImpl::GetMimeType() {
   CEF_VALUE_VERIFY_RETURN(false, CefString());
   return const_value().GetMimeType();
 }
-
-CefString CefDownloadItemImpl::GetReferrerCharset() {
-  CEF_VALUE_VERIFY_RETURN(false, CefString());
-  return const_value().GetReferrerCharset();
-}

libcef/browser/download_item_impl.h

@@ -36,7 +36,6 @@ class CefDownloadItemImpl
   virtual CefString GetSuggestedFileName() OVERRIDE;
   virtual CefString GetContentDisposition() OVERRIDE;
   virtual CefString GetMimeType() OVERRIDE;
-  virtual CefString GetReferrerCharset() OVERRIDE;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(CefDownloadItemImpl);

libcef/browser/download_manager_delegate.cc

@@ -263,7 +263,7 @@ bool CefDownloadManagerDelegate::DetermineDownloadTarget(
     FilePath suggested_name = net::GenerateFileName(
         item->GetURL(),
         item->GetContentDisposition(),
-        item->GetReferrerCharset(),
+        EmptyString(),
         item->GetSuggestedFilename(),
         item->GetMimeType(),
         "download");

libcef/browser/geolocation_impl.cc

@@ -65,7 +65,8 @@ bool CefGetGeolocation(CefRefPtr<CefGetGeolocationCallback> callback) {
   }
 
   if (CEF_CURRENTLY_ON_IOT()) {
-    GeolocationProvider* provider = GeolocationProvider::GetInstance();
+    content::GeolocationProvider* provider =
+        content::GeolocationProvider::GetInstance();
     if (provider) {
       provider->RequestCallback(base::Bind(LocationCallback, callback));
       return true;

libcef/browser/resource_dispatcher_host_delegate.cc

@@ -11,11 +11,12 @@ CefResourceDispatcherHostDelegate::CefResourceDispatcherHostDelegate() {
 CefResourceDispatcherHostDelegate::~CefResourceDispatcherHostDelegate() {
 }
 
-void CefResourceDispatcherHostDelegate::HandleExternalProtocol(const GURL& url,
+bool CefResourceDispatcherHostDelegate::HandleExternalProtocol(const GURL& url,
                                                                int child_id,
                                                                int route_id) {
   CefRefPtr<CefBrowserHostImpl> browser =
       CefBrowserHostImpl::GetBrowserByRoutingID(child_id, route_id);
   if (browser.get())
     browser->HandleExternalProtocol(url);
+  return false;
 }

libcef/browser/resource_dispatcher_host_delegate.h

@@ -16,7 +16,7 @@ class CefResourceDispatcherHostDelegate
   virtual ~CefResourceDispatcherHostDelegate();
 
   // ResourceDispatcherHostDelegate methods.
-  virtual void HandleExternalProtocol(const GURL& url,
+  virtual bool HandleExternalProtocol(const GURL& url,
                                       int child_id,
                                       int route_id) OVERRIDE;
 

libcef/browser/url_network_delegate.cc

@@ -135,7 +135,7 @@ void CefNetworkDelegate::OnSendHeaders(
 int CefNetworkDelegate::OnHeadersReceived(
     net::URLRequest* request,
     const net::CompletionCallback& callback,
-    net::HttpResponseHeaders* original_response_headers,
+    const net::HttpResponseHeaders* original_response_headers,
     scoped_refptr<net::HttpResponseHeaders>* override_response_headers) {
   return net::OK;
 }

libcef/browser/url_network_delegate.h

@@ -28,7 +28,7 @@ class CefNetworkDelegate : public net::NetworkDelegate {
   virtual int OnHeadersReceived(
       net::URLRequest* request,
       const net::CompletionCallback& callback,
-      net::HttpResponseHeaders* original_response_headers,
+      const net::HttpResponseHeaders* original_response_headers,
       scoped_refptr<net::HttpResponseHeaders>* override_response_headers)
       OVERRIDE;
   virtual void OnBeforeRedirect(net::URLRequest* request,

libcef/browser/url_request_context_getter.cc

@@ -164,10 +164,7 @@ net::URLRequestContext* CefURLRequestContextGetter::GetURLRequestContext() {
     url_request_context_->set_accept_language("en-us,en");
     url_request_context_->set_accept_charset("iso-8859-1,*,utf-8");
 
-    storage_->set_host_resolver(
+    storage_->set_host_resolver(net::HostResolver::CreateDefaultResolver(NULL));
-        net::CreateSystemHostResolver(net::HostResolver::kDefaultParallelism,
-                                      net::HostResolver::kDefaultRetryAttempts,
-                                      NULL));
     storage_->set_cert_verifier(net::CertVerifier::CreateDefault());
 
     bool proxy_service_set = false;

libcef/browser/url_request_context_proxy.cc

@@ -159,6 +159,5 @@ void CefURLRequestContextProxy::Initialize(CefBrowserHostImpl* browser) {
   set_transport_security_state(context->transport_security_state());
   set_accept_charset(context->accept_charset());
   set_accept_language(context->accept_language());
-  set_referrer_charset(context->referrer_charset());
   set_job_factory(context->job_factory());
 }

libcef/browser/web_plugin_impl.cc

@@ -70,7 +70,7 @@ void CefVisitWebPluginInfo(CefRefPtr<CefWebPluginInfoVisitor> visitor) {
   }
 
   if (CEF_CURRENTLY_ON_UIT()) {
-    PluginServiceImpl::GetInstance()->GetPlugins(
+    content::PluginServiceImpl::GetInstance()->GetPlugins(
         base::Bind(PluginsCallbackImpl, visitor));
   } else {
     // Execute on the UI thread.
@@ -86,7 +86,7 @@ void CefRefreshWebPlugins() {
   }
 
   // No thread affinity.
-  PluginServiceImpl::GetInstance()->RefreshPlugins();
+  content::PluginServiceImpl::GetInstance()->RefreshPlugins();
 }
 
 void CefAddWebPluginPath(const CefString& path) {
@@ -102,7 +102,7 @@ void CefAddWebPluginPath(const CefString& path) {
   }
 
   // No thread affinity.
-  PluginServiceImpl::GetInstance()->AddExtraPluginPath(FilePath(path));
+  content::PluginServiceImpl::GetInstance()->AddExtraPluginPath(FilePath(path));
 }
 
 void CefAddWebPluginDirectory(const CefString& dir) {
@@ -118,7 +118,7 @@ void CefAddWebPluginDirectory(const CefString& dir) {
   }
 
   // No thread affinity.
-  PluginServiceImpl::GetInstance()->AddExtraPluginDir(FilePath(dir));
+  content::PluginServiceImpl::GetInstance()->AddExtraPluginDir(FilePath(dir));
 }
 
 void CefRemoveWebPluginPath(const CefString& path) {
@@ -134,7 +134,8 @@ void CefRemoveWebPluginPath(const CefString& path) {
   }
 
   // No thread affinity.
-  PluginServiceImpl::GetInstance()->RemoveExtraPluginPath(FilePath(path));
+  content::PluginServiceImpl::GetInstance()->RemoveExtraPluginPath(
+      FilePath(path));
 }
 
 void CefUnregisterInternalWebPlugin(const CefString& path) {
@@ -150,7 +151,8 @@ void CefUnregisterInternalWebPlugin(const CefString& path) {
   }
 
   // No thread affinity.
-  PluginServiceImpl::GetInstance()->UnregisterInternalPlugin(FilePath(path));
+  content::PluginServiceImpl::GetInstance()->UnregisterInternalPlugin(
+      FilePath(path));
 }
 
 void CefForceWebPluginShutdown(const CefString& path) {
@@ -166,7 +168,8 @@ void CefForceWebPluginShutdown(const CefString& path) {
   }
 
   if (CEF_CURRENTLY_ON_IOT()) {
-    PluginServiceImpl::GetInstance()->ForcePluginShutdown(FilePath(path));
+    content::PluginServiceImpl::GetInstance()->ForcePluginShutdown(
+        FilePath(path));
   } else {
     // Execute on the IO thread.
     CEF_POST_TASK(CEF_IOT, base::Bind(CefForceWebPluginShutdown, path));
@@ -186,7 +189,8 @@ void CefRegisterWebPluginCrash(const CefString& path) {
   }
 
   if (CEF_CURRENTLY_ON_IOT()) {
-    PluginServiceImpl::GetInstance()->RegisterPluginCrash(FilePath(path));
+    content::PluginServiceImpl::GetInstance()->RegisterPluginCrash(
+        FilePath(path));
   } else {
     // Execute on the IO thread.
     CEF_POST_TASK(CEF_IOT, base::Bind(CefRegisterWebPluginCrash, path));
@@ -209,7 +213,8 @@ void CefIsWebPluginUnstable(
 
   if (CEF_CURRENTLY_ON_IOT()) {
     callback->IsUnstable(path,
-        PluginServiceImpl::GetInstance()->IsPluginUnstable(FilePath(path)));
+        content::PluginServiceImpl::GetInstance()->IsPluginUnstable(
+            FilePath(path)));
   } else {
     // Execute on the IO thread.
     CEF_POST_TASK(CEF_IOT, base::Bind(CefIsWebPluginUnstable, path, callback));

libcef/common/content_client.cc

@@ -85,8 +85,8 @@ base::StringPiece CefContentClient::GetDataResource(
     int resource_id,
     ui::ScaleFactor scale_factor) const {
   base::StringPiece value =
-      ResourceBundle::GetSharedInstance().GetRawDataResource(resource_id,
+      ResourceBundle::GetSharedInstance().GetRawDataResourceForScale(
-                                                             scale_factor);
+          resource_id, scale_factor);
   if (value.empty())
     LOG(ERROR) << "No data resource available for id " << resource_id;
 

libcef/renderer/browser_impl.cc

@@ -33,6 +33,7 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScriptSource.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityPolicy.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
+#include "webkit/base/file_path_string_conversions.h"
 #include "webkit/glue/webkit_glue.h"
 
 using WebKit::WebFrame;
@@ -321,7 +322,7 @@ void CefBrowserImpl::LoadRequest(const CefMsg_LoadRequest_Params& params) {
         data.assign(element.bytes(), element.bytes_length());
         body.appendData(data);
       } else if (element.type() == net::UploadElement::TYPE_FILE) {
-        body.appendFile(webkit_glue::FilePathToWebString(element.file_path()));
+        body.appendFile(webkit_base::FilePathToWebString(element.file_path()));
       } else {
         NOTREACHED();
       }

libcef_dll/cpptoc/download_item_cpptoc.cc

@@ -251,21 +251,6 @@ cef_string_userfree_t CEF_CALLBACK download_item_get_mime_type(
   return _retval.DetachToUserFree();
 }
 
-cef_string_userfree_t CEF_CALLBACK download_item_get_referrer_charset(
-    struct _cef_download_item_t* self) {
-  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
-
-  DCHECK(self);
-  if (!self)
-    return NULL;
-
-  // Execute
-  CefString _retval = CefDownloadItemCppToC::Get(self)->GetReferrerCharset();
-
-  // Return type: string
-  return _retval.DetachToUserFree();
-}
-
 
 // CONSTRUCTOR - Do not edit by hand.
 
@@ -290,7 +275,6 @@ CefDownloadItemCppToC::CefDownloadItemCppToC(CefDownloadItem* cls)
   struct_.struct_.get_content_disposition =
       download_item_get_content_disposition;
   struct_.struct_.get_mime_type = download_item_get_mime_type;
-  struct_.struct_.get_referrer_charset = download_item_get_referrer_charset;
 }
 
 #ifndef NDEBUG

libcef_dll/ctocpp/download_item_ctocpp.cc

@@ -233,21 +233,6 @@ CefString CefDownloadItemCToCpp::GetMimeType() {
   return _retvalStr;
 }
 
-CefString CefDownloadItemCToCpp::GetReferrerCharset() {
-  if (CEF_MEMBER_MISSING(struct_, get_referrer_charset))
-    return CefString();
-
-  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
-
-  // Execute
-  cef_string_userfree_t _retval = struct_->get_referrer_charset(struct_);
-
-  // Return type: string
-  CefString _retvalStr;
-  _retvalStr.AttachToUserFree(_retval);
-  return _retvalStr;
-}
-
 
 #ifndef NDEBUG
 template<> long CefCToCpp<CefDownloadItemCToCpp, CefDownloadItem,

libcef_dll/ctocpp/download_item_ctocpp.h

@@ -50,7 +50,6 @@ class CefDownloadItemCToCpp
   virtual CefString GetSuggestedFileName() OVERRIDE;
   virtual CefString GetContentDisposition() OVERRIDE;
   virtual CefString GetMimeType() OVERRIDE;
-  virtual CefString GetReferrerCharset() OVERRIDE;
 };
 
 #endif  // USING_CEF_SHARED

patch/patches/tools_gyp.patch

@@ -1,8 +1,8 @@
 Index: pylib/gyp/input.py
 ===================================================================
---- pylib/gyp/input.py	(revision 1508)
+--- pylib/gyp/input.py	(revision 1527)
 +++ pylib/gyp/input.py	(working copy)
-@@ -824,7 +824,8 @@
+@@ -851,7 +851,8 @@
            # that don't load quickly, this can be faster than
            # <!(python modulename param eters). Do this in |build_file_dir|.
            oldwd = os.getcwd()  # Python doesn't like os.open('.'): no fchdir.

tests/unittests/test_suite.cc

@@ -9,6 +9,7 @@
 #include "base/test/test_suite.h"
 
 #if defined(OS_MACOSX)
+#include "base/debug/stack_trace.h"
 #include "base/file_path.h"
 #include "base/i18n/icu_util.h"
 #include "base/path_service.h"
@@ -96,7 +97,7 @@ void CefTestSuite::Initialize() {
   // Note: temporarily enabled timestamps in an effort to catch bug 6361.
   logging::SetLogItems(true, true, true, true);
 
-  CHECK(base::EnableInProcessStackDumping());
+  CHECK(base::debug::EnableInProcessStackDumping());
 
   // In some cases, we do not want to see standard error dialogs.
   if (!base::debug::BeingDebugged() &&

tests/unittests/urlrequest_unittest.cc

@@ -842,6 +842,9 @@ class RequestRendererTest : public ClientApp::RenderDelegate,
 class RequestTestHandler : public TestHandler,
                            public RequestTestRunner::Delegate {
  public:
+  // Don't hide the DestroyTest method.
+  using TestHandler::DestroyTest;
+
   RequestTestHandler(RequestTestMode test_mode,
                      bool test_in_browser,
                      const char* test_url)

tests/unittests/v8_unittest.cc

@@ -1955,8 +1955,9 @@ class V8TestHandler : public TestHandler {
                          int httpStatusCode) OVERRIDE {
     if (test_mode_ == V8TEST_ON_UNCAUGHT_EXCEPTION_DEV_TOOLS) {
       if (browser->IsPopup()) {
-        EXPECT_STREQ(GetBrowser()->GetHost()->GetDevToolsURL(true).c_str(),
+        EXPECT_STREQ(
-                     frame->GetURL().c_str());
+            GetBrowser()->GetHost()->GetDevToolsURL(true).ToString().c_str(),
+            frame->GetURL().ToString().c_str());
         CefRefPtr<CefProcessMessage> return_msg =
             CefProcessMessage::Create(kV8DevToolsLoadHookMsg);
         EXPECT_TRUE(browser->SendProcessMessage(PID_RENDERER, return_msg));