Update to Chromium revision 157509.

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

CHROMIUM_BUILD_COMPATIBILITY.txt

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

cef.gyp

@@ -665,7 +665,7 @@
               '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak',
               '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.pak',
               '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.pak',
-              '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.pak',
+              '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources_100_percent.pak',
               '<(grit_out_dir)/cef_resources.pak',
             ],
           },

include/internal/cef_types.h

@@ -803,13 +803,6 @@ enum cef_urlrequest_status_t {
   ///
   UR_IO_PENDING,
   
-  ///
-  // Request was successful but was handled by an external program, so there
-  // is no response data. This usually means the current page should not be
-  // navigated, but no error should be displayed.
-  ///
-  UR_HANDLED_EXTERNALLY,
-  
   ///
   // Request was canceled programatically.
   ///

libcef/browser/browser_context.cc

@@ -175,6 +175,7 @@ class CefSpeechRecognitionPreferences
 CefBrowserContext::CefBrowserContext() {
   // Initialize the request context getter.
   url_request_getter_ = new CefURLRequestContextGetter(
+      false,
       GetPath(),
       BrowserThread::UnsafeGetMessageLoopForThread(BrowserThread::IO),
       BrowserThread::UnsafeGetMessageLoopForThread(BrowserThread::FILE));
@@ -233,6 +234,18 @@ net::URLRequestContextGetter*
   return GetRequestContext();
 }
 
+net::URLRequestContextGetter*
+    CefBrowserContext::GetMediaRequestContextForStoragePartition(
+        const std::string& partition_id) {
+  return GetRequestContext();
+}
+
+net::URLRequestContextGetter*
+    CefBrowserContext::GetRequestContextForStoragePartition(
+        const std::string& partition_id)  {
+  return NULL;
+}
+
 content::ResourceContext* CefBrowserContext::GetResourceContext() {
   if (!resource_context_.get()) {
     resource_context_.reset(new CefResourceContext(

libcef/browser/browser_context.h

@@ -35,6 +35,11 @@ class CefBrowserContext : public content::BrowserContext {
   virtual net::URLRequestContextGetter* GetMediaRequestContext() OVERRIDE;
   virtual net::URLRequestContextGetter* GetMediaRequestContextForRenderProcess(
       int renderer_child_id) OVERRIDE;
+  virtual net::URLRequestContextGetter*
+      GetMediaRequestContextForStoragePartition(
+          const std::string& partition_id) OVERRIDE;
+  virtual net::URLRequestContextGetter* GetRequestContextForStoragePartition(
+      const std::string& partition_id) OVERRIDE;
   virtual content::ResourceContext* GetResourceContext() OVERRIDE;
   virtual content::GeolocationPermissionContext*
       GetGeolocationPermissionContext() OVERRIDE;

libcef/browser/browser_settings.cc

@@ -172,7 +172,7 @@ void BrowserToWebSettings(const CefBrowserSettings& cef, WebPreferences& web) {
         content::GpuDataManager::GetInstance();
     DCHECK(gpu_data_manager);
     content::GpuFeatureType blacklist_flags =
-        gpu_data_manager->GetGpuFeatureType();
+        gpu_data_manager->GetBlacklistedFeatures();
     if (blacklist_flags & content::GPU_FEATURE_TYPE_ACCELERATED_COMPOSITING)
       web.accelerated_compositing_enabled = false;
     if (blacklist_flags & content::GPU_FEATURE_TYPE_WEBGL)

libcef/browser/browser_urlrequest_impl.cc

@@ -244,9 +244,6 @@ class CefBrowserURLRequest::Context
         case net::URLRequestStatus::IO_PENDING:
           status_ = UR_IO_PENDING;
           break;
-        case net::URLRequestStatus::HANDLED_EXTERNALLY:
-          status_ = UR_HANDLED_EXTERNALLY;
-          break;
         case net::URLRequestStatus::CANCELED:
           status_ = UR_CANCELED;
           break;

libcef/browser/url_request_context_getter.cc

@@ -121,10 +121,12 @@ class CefProxyResolver : public net::ProxyResolver {
 }  // namespace
 
 CefURLRequestContextGetter::CefURLRequestContextGetter(
+    bool ignore_certificate_errors,
     const FilePath& base_path,
     MessageLoop* io_loop,
     MessageLoop* file_loop)
-    : base_path_(base_path),
+    : ignore_certificate_errors_(ignore_certificate_errors),
+      base_path_(base_path),
       io_loop_(io_loop),
       file_loop_(file_loop) {
   // Must first be created on the UI thread.
@@ -256,20 +258,28 @@ net::URLRequestContext* CefURLRequestContextGetter::GetURLRequestContext() {
             BrowserThread::GetMessageLoopProxyForThread(
                 BrowserThread::CACHE));
 
-    net::HttpCache* main_cache = new net::HttpCache(
-        url_request_context_->host_resolver(),
-        url_request_context_->cert_verifier(),
-        url_request_context_->server_bound_cert_service(),
-        NULL,  /* tranport_security_state */
-        url_request_context_->proxy_service(),
-        "",  /* ssl_session_cache_shard */
-        url_request_context_->ssl_config_service(),
-        url_request_context_->http_auth_handler_factory(),
-        NULL,  /* network_delegate */
-        url_request_context_->http_server_properties(),
-        NULL,
-        main_backend,
-        ""  /* trusted_spdy_proxy */);
+    net::HttpNetworkSession::Params network_session_params;
+    network_session_params.host_resolver =
+        url_request_context_->host_resolver();
+    network_session_params.cert_verifier =
+        url_request_context_->cert_verifier();
+    network_session_params.server_bound_cert_service =
+        url_request_context_->server_bound_cert_service();
+    network_session_params.proxy_service =
+        url_request_context_->proxy_service();
+    network_session_params.ssl_config_service =
+        url_request_context_->ssl_config_service();
+    network_session_params.http_auth_handler_factory =
+        url_request_context_->http_auth_handler_factory();
+    network_session_params.network_delegate =
+        url_request_context_->network_delegate();
+    network_session_params.http_server_properties =
+        url_request_context_->http_server_properties();
+    network_session_params.ignore_certificate_errors =
+        ignore_certificate_errors_;
+
+    net::HttpCache* main_cache = new net::HttpCache(network_session_params,
+                                                    main_backend);
     storage_->set_http_transaction_factory(main_cache);
 
     storage_->set_ftp_transaction_factory(

libcef/browser/url_request_context_getter.h

@@ -31,7 +31,8 @@ class URLSecurityManager;
 class CefURLRequestContextGetter : public net::URLRequestContextGetter {
  public:
   CefURLRequestContextGetter(
-      const FilePath& base_path_,
+      bool ignore_certificate_errors,
+      const FilePath& base_path,
       MessageLoop* io_loop,
       MessageLoop* file_loop);
   virtual ~CefURLRequestContextGetter();
@@ -55,6 +56,7 @@ class CefURLRequestContextGetter : public net::URLRequestContextGetter {
  private:
   void CreateProxyConfigService();
 
+  bool ignore_certificate_errors_;
   FilePath base_path_;
   MessageLoop* io_loop_;
   MessageLoop* file_loop_;

libcef/common/content_client.cc

@@ -16,7 +16,7 @@
 #include "base/stringprintf.h"
 #include "content/public/common/content_switches.h"
 #include "ui/base/resource/resource_bundle.h"
-#include "webkit/glue/user_agent.h"
+#include "webkit/user_agent/user_agent_util.h"
 
 namespace {
 

patch/patches/tools_gyp.patch

@@ -1,8 +1,8 @@
-Index: pylib/gyp/input.py
-===================================================================
---- pylib/gyp/input.py	(revision 1402)
-+++ pylib/gyp/input.py	(working copy)
-@@ -684,7 +684,8 @@
+Index: pylib/gyp/input.py
+===================================================================
+--- pylib/gyp/input.py	(revision 1501)
++++ pylib/gyp/input.py	(working copy)
+@@ -685,7 +685,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.