Update to Chromium revision 275973.

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

CHROMIUM_BUILD_COMPATIBILITY.txt

@@ -8,6 +8,6 @@
 
 {
   'chromium_url': 'http://src.chromium.org/svn/trunk/src',
-  'chromium_revision': '272007',
+  'chromium_revision': '275973',
-  'chromium_checkout': '556ef20cb5deabfd321c044cba8417c2725266cc',
+  'chromium_checkout': '9e96d7351ccb48be8548f7aec7b751b822c7d97c',
 }

cef.gyp

@@ -1116,10 +1116,10 @@
           'sources': [
             'libcef/browser/window_delegate_view.cc',
             'libcef/browser/window_delegate_view.h',
-            '<(DEPTH)/ui/views/test/desktop_test_views_delegate.cc',
             '<(DEPTH)/ui/views/test/desktop_test_views_delegate.h',
-            '<(DEPTH)/ui/views/test/test_views_delegate.cc',
+            '<(DEPTH)/ui/views/test/desktop_test_views_delegate_aura.cc',
             '<(DEPTH)/ui/views/test/test_views_delegate.h',
+            '<(DEPTH)/ui/views/test/test_views_delegate_aura.cc',
           ],
         }],
       ],

cef.gypi

@@ -14,6 +14,10 @@
         'enable_skia_text': 1,
         # Disable tcmalloc's debugallocation to avoid crashing during startup.
         'disable_debugallocation': 1,
+        # Disable printing to PDF in the renderer process. This will need to be
+        # supported in the future as the old printing approach will be removed.
+        # See https://code.google.com/p/chromiumembedded/issues/detail?id=1313.
+        'win_pdf_metafile_for_printing': 0,
       }, { # OS!="win"
         'cef_directory' : '<!(echo $CEF_DIRECTORY)',
       }],

libcef/browser/browser_context.h

@@ -13,12 +13,12 @@ class CefBrowserContext : public content::BrowserContext {
  public:
   virtual net::URLRequestContextGetter* CreateRequestContext(
       content::ProtocolHandlerMap* protocol_handlers,
-      content::ProtocolHandlerScopedVector protocol_interceptors) = 0;
+      content::URLRequestInterceptorScopedVector request_interceptors) = 0;
   virtual net::URLRequestContextGetter* CreateRequestContextForStoragePartition(
       const base::FilePath& partition_path,
       bool in_memory,
       content::ProtocolHandlerMap* protocol_handlers,
-      content::ProtocolHandlerScopedVector protocol_interceptors) = 0;
+      content::URLRequestInterceptorScopedVector request_interceptors) = 0;
 };
 
 #endif  // CEF_LIBCEF_BROWSER_BROWSER_CONTEXT_H_

libcef/browser/browser_context_impl.cc

@@ -267,14 +267,14 @@ void CefBrowserContextImpl::CancelMidiSysExPermissionRequest(
 void CefBrowserContextImpl::RequestProtectedMediaIdentifierPermission(
     int render_process_id,
     int render_view_id,
-    int bridge_id,
+    const GURL& origin,
-    int group_id,
-    const GURL& requesting_frame,
     const ProtectedMediaIdentifierPermissionCallback& callback) {
 }
 
 void CefBrowserContextImpl::CancelProtectedMediaIdentifierPermissionRequests(
-      int group_id) {
+    int render_process_id,
+    int render_view_id,
+    const GURL& origin) {
 }
 
 content::ResourceContext* CefBrowserContextImpl::GetResourceContext() {
@@ -300,13 +300,13 @@ quota::SpecialStoragePolicy* CefBrowserContextImpl::GetSpecialStoragePolicy() {
 
 net::URLRequestContextGetter* CefBrowserContextImpl::CreateRequestContext(
     content::ProtocolHandlerMap* protocol_handlers,
-    content::ProtocolHandlerScopedVector protocol_interceptors) {
+    content::URLRequestInterceptorScopedVector request_interceptors) {
   DCHECK(!url_request_getter_);
   url_request_getter_ = new CefURLRequestContextGetter(
       BrowserThread::UnsafeGetMessageLoopForThread(BrowserThread::IO),
       BrowserThread::UnsafeGetMessageLoopForThread(BrowserThread::FILE),
       protocol_handlers,
-      protocol_interceptors.Pass());
+      request_interceptors.Pass());
   resource_context_->set_url_request_context_getter(url_request_getter_.get());
   return url_request_getter_.get();
 }
@@ -316,6 +316,6 @@ net::URLRequestContextGetter*
         const base::FilePath& partition_path,
         bool in_memory,
         content::ProtocolHandlerMap* protocol_handlers,
-        content::ProtocolHandlerScopedVector protocol_interceptors) {
+        content::URLRequestInterceptorScopedVector request_interceptors) {
   return NULL;
 }

libcef/browser/browser_context_impl.h

@@ -54,12 +54,12 @@ class CefBrowserContextImpl : public CefBrowserContext {
   virtual void RequestProtectedMediaIdentifierPermission(
       int render_process_id,
       int render_view_id,
-      int bridge_id,
+      const GURL& origin,
-      int group_id,
-      const GURL& requesting_frame,
       const ProtectedMediaIdentifierPermissionCallback& callback) OVERRIDE;
   virtual void CancelProtectedMediaIdentifierPermissionRequests(
-      int group_id) OVERRIDE;
+      int render_process_id,
+      int render_view_id,
+      const GURL& origin) OVERRIDE;
   virtual content::ResourceContext* GetResourceContext() OVERRIDE;
   virtual content::GeolocationPermissionContext*
       GetGeolocationPermissionContext() OVERRIDE;
@@ -69,12 +69,14 @@ class CefBrowserContextImpl : public CefBrowserContext {
   // CefBrowserContext methods.
   virtual net::URLRequestContextGetter* CreateRequestContext(
       content::ProtocolHandlerMap* protocol_handlers,
-      content::ProtocolHandlerScopedVector protocol_interceptors) OVERRIDE;
+      content::URLRequestInterceptorScopedVector request_interceptors)
+      OVERRIDE;
   virtual net::URLRequestContextGetter* CreateRequestContextForStoragePartition(
       const base::FilePath& partition_path,
       bool in_memory,
       content::ProtocolHandlerMap* protocol_handlers,
-      content::ProtocolHandlerScopedVector protocol_interceptors) OVERRIDE;
+      content::URLRequestInterceptorScopedVector request_interceptors)
+      OVERRIDE;
 
  private:
   class CefResourceContext;

libcef/browser/browser_context_proxy.cc

@@ -133,14 +133,14 @@ void CefBrowserContextProxy::CancelMidiSysExPermissionRequest(
 void CefBrowserContextProxy::RequestProtectedMediaIdentifierPermission(
     int render_process_id,
     int render_view_id,
-    int bridge_id,
+    const GURL& origin,
-    int group_id,
-    const GURL& requesting_frame,
     const ProtectedMediaIdentifierPermissionCallback& callback) {
 }
 
 void CefBrowserContextProxy::CancelProtectedMediaIdentifierPermissionRequests(
-    int group_id) {
+    int render_process_id,
+    int render_view_id,
+    const GURL& origin) {
 }
 
 content::ResourceContext* CefBrowserContextProxy::GetResourceContext() {
@@ -162,7 +162,7 @@ quota::SpecialStoragePolicy* CefBrowserContextProxy::GetSpecialStoragePolicy() {
 
 net::URLRequestContextGetter* CefBrowserContextProxy::CreateRequestContext(
     content::ProtocolHandlerMap* protocol_handlers,
-    content::ProtocolHandlerScopedVector protocol_interceptors) {
+    content::URLRequestInterceptorScopedVector request_interceptors) {
   DCHECK(!url_request_getter_);
   url_request_getter_ =
       new CefURLRequestContextGetterProxy(handler_,
@@ -177,6 +177,6 @@ net::URLRequestContextGetter*
         const base::FilePath& partition_path,
         bool in_memory,
         content::ProtocolHandlerMap* protocol_handlers,
-        content::ProtocolHandlerScopedVector protocol_interceptors) {
+        content::URLRequestInterceptorScopedVector request_interceptors) {
   return NULL;
 }

libcef/browser/browser_context_proxy.h

@@ -62,12 +62,12 @@ class CefBrowserContextProxy : public CefBrowserContext {
   virtual void RequestProtectedMediaIdentifierPermission(
       int render_process_id,
       int render_view_id,
-      int bridge_id,
+      const GURL& origin,
-      int group_id,
-      const GURL& requesting_frame,
       const ProtectedMediaIdentifierPermissionCallback& callback) OVERRIDE;
   virtual void CancelProtectedMediaIdentifierPermissionRequests(
-      int group_id) OVERRIDE;
+      int render_process_id,
+      int render_view_id,
+      const GURL& origin) OVERRIDE;
   virtual content::ResourceContext* GetResourceContext() OVERRIDE;
   virtual content::GeolocationPermissionContext*
       GetGeolocationPermissionContext() OVERRIDE;
@@ -77,12 +77,14 @@ class CefBrowserContextProxy : public CefBrowserContext {
   // CefBrowserContext methods.
   virtual net::URLRequestContextGetter* CreateRequestContext(
       content::ProtocolHandlerMap* protocol_handlers,
-      content::ProtocolHandlerScopedVector protocol_interceptors) OVERRIDE;
+      content::URLRequestInterceptorScopedVector request_interceptors)
+      OVERRIDE;
   virtual net::URLRequestContextGetter* CreateRequestContextForStoragePartition(
       const base::FilePath& partition_path,
       bool in_memory,
       content::ProtocolHandlerMap* protocol_handlers,
-      content::ProtocolHandlerScopedVector protocol_interceptors) OVERRIDE;
+      content::URLRequestInterceptorScopedVector request_interceptors)
+      OVERRIDE;
 
   CefRefPtr<CefRequestContextHandler> handler() const { return handler_; }
 

libcef/browser/browser_host_impl.cc

@@ -37,6 +37,7 @@
 #include "content/common/view_messages.h"
 #include "content/public/browser/download_manager.h"
 #include "content/public/browser/download_url_parameters.h"
+#include "content/public/browser/host_zoom_map.h"
 #include "content/public/browser/native_web_keyboard_event.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
@@ -680,16 +681,16 @@ double CefBrowserHostImpl::GetZoomLevel() {
     return 0;
   }
 
-  if (web_contents_.get())
+  if (web_contents())
-    return web_contents_->GetZoomLevel();
+    return content::HostZoomMap::GetZoomLevel(web_contents());
 
   return 0;
 }
 
 void CefBrowserHostImpl::SetZoomLevel(double zoomLevel) {
   if (CEF_CURRENTLY_ON_UIT()) {
-    if (web_contents_.get())
+    if (web_contents())
-      web_contents_->SetZoomLevel(zoomLevel);
+      content::HostZoomMap::SetZoomLevel(web_contents(), zoomLevel);
   } else {
     CEF_POST_TASK(CEF_UIT,
         base::Bind(&CefBrowserHostImpl::SetZoomLevel, this, zoomLevel));

libcef/browser/browser_main.cc

@@ -37,7 +37,7 @@
 #endif
 #endif  // defined(USE_AURA)
 
-#if defined(USE_AURA) && defined(USE_X11)
+#if defined(USE_AURA) && defined(OS_LINUX)
 #include "ui/base/ime/input_method_initializer.h"
 #endif
 
@@ -59,7 +59,7 @@ void CefBrowserMainParts::PreMainMessageLoopStart() {
 }
 
 void CefBrowserMainParts::PreEarlyInitialization() {
-#if defined(USE_AURA) && defined(USE_X11)
+#if defined(USE_AURA) && defined(OS_LINUX)
   // TODO(linux): Consider using a real input method or
   // views::LinuxUI::SetInstance.
   ui::InitializeInputMethodForTesting();

libcef/browser/chrome_browser_process_stub.cc

@@ -25,6 +25,11 @@ void ChromeBrowserProcessStub::EndSession() {
   NOTIMPLEMENTED();
 };
 
+MetricsServicesManager* ChromeBrowserProcessStub::GetMetricsServicesManager() {
+  NOTIMPLEMENTED();
+  return NULL;
+}
+
 MetricsService* ChromeBrowserProcessStub::metrics_service() {
   NOTIMPLEMENTED();
   return NULL;
@@ -252,6 +257,13 @@ WebRtcLogUploader* ChromeBrowserProcessStub::webrtc_log_uploader() {
 }
 #endif
 
-NetworkTimeTracker* ChromeBrowserProcessStub::network_time_tracker() {
+network_time::NetworkTimeTracker*
+    ChromeBrowserProcessStub::network_time_tracker() {
+  NOTIMPLEMENTED();
+  return NULL;
+}
+
+gcm::GCMDriver* ChromeBrowserProcessStub::gcm_driver() {
+  NOTIMPLEMENTED();
   return NULL;
 }

libcef/browser/chrome_browser_process_stub.h

@@ -31,6 +31,7 @@ class ChromeBrowserProcessStub : public BrowserProcess {
   // BrowserProcess implementation.
   virtual void ResourceDispatcherHostCreated() OVERRIDE;
   virtual void EndSession() OVERRIDE;
+  virtual MetricsServicesManager* GetMetricsServicesManager() OVERRIDE;
   virtual MetricsService* metrics_service() OVERRIDE;
   virtual rappor::RapporService* rappor_service() OVERRIDE;
   virtual IOThread* io_thread() OVERRIDE;
@@ -91,7 +92,8 @@ class ChromeBrowserProcessStub : public BrowserProcess {
 #if defined(ENABLE_WEBRTC)
   virtual WebRtcLogUploader* webrtc_log_uploader() OVERRIDE;
 #endif
-  virtual NetworkTimeTracker* network_time_tracker() OVERRIDE;
+  virtual network_time::NetworkTimeTracker* network_time_tracker() OVERRIDE;
+  virtual gcm::GCMDriver* gcm_driver() OVERRIDE;
 
  private:
   std::string locale_;

libcef/browser/content_browser_client.cc

@@ -551,12 +551,12 @@ void CefContentBrowserClient::RenderProcessWillLaunch(
 net::URLRequestContextGetter* CefContentBrowserClient::CreateRequestContext(
     content::BrowserContext* content_browser_context,
     content::ProtocolHandlerMap* protocol_handlers,
-    content::ProtocolHandlerScopedVector protocol_interceptors) {
+    content::URLRequestInterceptorScopedVector request_interceptors) {
   CefBrowserContext* cef_browser_context =
       static_cast<CefBrowserContext*>(content_browser_context);
   return cef_browser_context->CreateRequestContext(
       protocol_handlers,
-      protocol_interceptors.Pass());
+      request_interceptors.Pass());
 }
 
 net::URLRequestContextGetter*
@@ -565,14 +565,14 @@ CefContentBrowserClient::CreateRequestContextForStoragePartition(
     const base::FilePath& partition_path,
     bool in_memory,
     content::ProtocolHandlerMap* protocol_handlers,
-    content::ProtocolHandlerScopedVector protocol_interceptors) {
+    content::URLRequestInterceptorScopedVector request_interceptors) {
   CefBrowserContext* cef_browser_context =
       static_cast<CefBrowserContext*>(content_browser_context);
   return cef_browser_context->CreateRequestContextForStoragePartition(
       partition_path,
       in_memory,
       protocol_handlers,
-      protocol_interceptors.Pass());
+      request_interceptors.Pass());
 }
 
 bool CefContentBrowserClient::IsHandledURL(const GURL& url) {
@@ -732,7 +732,6 @@ bool CefContentBrowserClient::CanCreateWindow(
     bool opener_suppressed,
     content::ResourceContext* context,
     int render_process_id,
-    bool is_guest,
     int opener_id,
     bool* no_javascript_access) {
   CEF_REQUIRE_IOT();

libcef/browser/content_browser_client.h

@@ -86,13 +86,15 @@ class CefContentBrowserClient : public content::ContentBrowserClient {
   virtual net::URLRequestContextGetter* CreateRequestContext(
       content::BrowserContext* browser_context,
       content::ProtocolHandlerMap* protocol_handlers,
-      content::ProtocolHandlerScopedVector protocol_interceptors) OVERRIDE;
+      content::URLRequestInterceptorScopedVector request_interceptors)
+      OVERRIDE;
   virtual net::URLRequestContextGetter* CreateRequestContextForStoragePartition(
       content::BrowserContext* browser_context,
       const base::FilePath& partition_path,
       bool in_memory,
       content::ProtocolHandlerMap* protocol_handlers,
-      content::ProtocolHandlerScopedVector protocol_interceptors) OVERRIDE;
+      content::URLRequestInterceptorScopedVector request_interceptors)
+      OVERRIDE;
   virtual bool IsHandledURL(const GURL& url) OVERRIDE;
   virtual void AppendExtraCommandLineSwitches(base::CommandLine* command_line,
                                               int child_process_id) OVERRIDE;
@@ -125,7 +127,6 @@ class CefContentBrowserClient : public content::ContentBrowserClient {
                                bool opener_suppressed,
                                content::ResourceContext* context,
                                int render_process_id,
-                               bool is_guest,
                                int opener_id,
                                bool* no_javascript_access) OVERRIDE;
   virtual void ResourceDispatcherHostCreated() OVERRIDE;

libcef/browser/devtools_delegate.cc

@@ -41,6 +41,7 @@ class Target : public content::DevToolsTarget {
   explicit Target(content::WebContents* web_contents);
 
   virtual std::string GetId() const OVERRIDE { return id_; }
+  virtual std::string GetParentId() const OVERRIDE { return std::string(); }
   virtual std::string GetType() const OVERRIDE { return kTargetTypePage; }
   virtual std::string GetTitle() const OVERRIDE { return title_; }
   virtual std::string GetDescription() const OVERRIDE { return std::string(); }
@@ -110,7 +111,8 @@ CefDevToolsDelegate::CefDevToolsDelegate(int port) {
   devtools_http_handler_ = content::DevToolsHttpHandler::Start(
       new net::TCPListenSocketFactory("127.0.0.1", port),
       "",
-      this);
+      this,
+      base::FilePath());
 }
 
 CefDevToolsDelegate::~CefDevToolsDelegate() {

libcef/browser/scheme_handler.cc

@@ -17,6 +17,7 @@
 #include "net/url_request/file_protocol_handler.h"
 #include "net/url_request/ftp_protocol_handler.h"
 #include "net/url_request/url_request_job_factory_impl.h"
+#include "url/url_constants.h"
 
 namespace scheme {
 
@@ -25,11 +26,11 @@ void InstallInternalProtectedHandlers(
     content::ProtocolHandlerMap* protocol_handlers,
     net::FtpTransactionFactory* ftp_transaction_factory) {
   protocol_handlers->insert(
-      std::make_pair(content::kDataScheme,
+      std::make_pair(url::kDataScheme,
           linked_ptr<net::URLRequestJobFactory::ProtocolHandler>(
               new net::DataProtocolHandler)));
   protocol_handlers->insert(
-      std::make_pair(content::kFileScheme,
+      std::make_pair(url::kFileScheme,
           linked_ptr<net::URLRequestJobFactory::ProtocolHandler>(
               new net::FileProtocolHandler(
                   content::BrowserThread::GetBlockingPool()->
@@ -37,7 +38,7 @@ void InstallInternalProtectedHandlers(
                           base::SequencedWorkerPool::SKIP_ON_SHUTDOWN)))));
 #if !defined(DISABLE_FTP_SUPPORT)
   protocol_handlers->insert(
-      std::make_pair(content::kFtpScheme,
+      std::make_pair(url::kFtpScheme,
           linked_ptr<net::URLRequestJobFactory::ProtocolHandler>(
               new net::FtpProtocolHandler(ftp_transaction_factory))));
 #endif

libcef/browser/url_request_context_getter.cc

@@ -47,11 +47,12 @@
 #include "net/ssl/default_server_bound_cert_store.h"
 #include "net/ssl/server_bound_cert_service.h"
 #include "net/ssl/ssl_config_service_defaults.h"
+#include "url/url_constants.h"
 #include "net/url_request/http_user_agent_settings.h"
-#include "net/url_request/protocol_intercept_job_factory.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_storage.h"
+#include "net/url_request/url_request_intercepting_job_factory.h"
 #include "net/url_request/url_request_job_factory_impl.h"
 #include "net/url_request/url_request_job_manager.h"
 
@@ -101,10 +102,10 @@ CefURLRequestContextGetter::CefURLRequestContextGetter(
     base::MessageLoop* io_loop,
     base::MessageLoop* file_loop,
     content::ProtocolHandlerMap* protocol_handlers,
-    content::ProtocolHandlerScopedVector protocol_interceptors)
+    content::URLRequestInterceptorScopedVector request_interceptors)
     : io_loop_(io_loop),
       file_loop_(file_loop),
-      protocol_interceptors_(protocol_interceptors.Pass()) {
+      request_interceptors_(request_interceptors.Pass()) {
   // Must first be created on the UI thread.
   CEF_REQUIRE_UIT();
 
@@ -237,14 +238,14 @@ net::URLRequestContext* CefURLRequestContextGetter::GetURLRequestContext() {
     // Set up interceptors in the reverse order.
     scoped_ptr<net::URLRequestJobFactory> top_job_factory =
         job_factory.PassAs<net::URLRequestJobFactory>();
-    for (content::ProtocolHandlerScopedVector::reverse_iterator i =
+    for (content::URLRequestInterceptorScopedVector::reverse_iterator i =
-             protocol_interceptors_.rbegin();
+             request_interceptors_.rbegin();
-         i != protocol_interceptors_.rend();
+         i != request_interceptors_.rend();
          ++i) {
-      top_job_factory.reset(new net::ProtocolInterceptJobFactory(
+      top_job_factory.reset(new net::URLRequestInterceptingJobFactory(
           top_job_factory.Pass(), make_scoped_ptr(*i)));
     }
-    protocol_interceptors_.weak_clear();
+    request_interceptors_.weak_clear();
 
     storage_->set_job_factory(top_job_factory.release());
 

libcef/browser/url_request_context_getter.h

@@ -82,7 +82,7 @@ class CefURLRequestContextGetter : public net::URLRequestContextGetter {
       base::MessageLoop* io_loop,
       base::MessageLoop* file_loop,
       content::ProtocolHandlerMap* protocol_handlers,
-      content::ProtocolHandlerScopedVector protocol_interceptors);
+      content::URLRequestInterceptorScopedVector request_interceptors);
   virtual ~CefURLRequestContextGetter();
 
   // net::URLRequestContextGetter implementation.
@@ -118,7 +118,7 @@ class CefURLRequestContextGetter : public net::URLRequestContextGetter {
   scoped_ptr<net::URLSecurityManager> url_security_manager_;
   scoped_ptr<net::FtpTransactionFactory> ftp_transaction_factory_;
   content::ProtocolHandlerMap protocol_handlers_;
-  content::ProtocolHandlerScopedVector protocol_interceptors_;
+  content::URLRequestInterceptorScopedVector request_interceptors_;
   net::URLRequestJobFactoryImpl* job_factory_impl_;
 
   typedef std::set<CefURLRequestContextProxy*> RequestContextProxySet;

libcef/browser/window_delegate_view.cc

@@ -33,7 +33,6 @@ void CefWindowDelegateView::Init(
   params.parent_widget = parent_widget;
   params.bounds = bounds;
   params.delegate = this;
-  params.top_level = true;
   // Set the WS_CHILD flag.
   params.child = true;
   // Set the WS_VISIBLE flag.
@@ -46,6 +45,8 @@ void CefWindowDelegateView::Init(
 
   // |widget| should now be associated with |this|.
   DCHECK_EQ(widget, GetWidget());
+  // |widget| must be top-level for focus handling to work correctly.
+  DCHECK(widget->is_top_level());
 }
 
 void CefWindowDelegateView::InitContent() {

libcef/common/scheme_registration.cc

@@ -6,6 +6,7 @@
 #include "libcef/common/content_client.h"
 
 #include "content/public/common/url_constants.h"
+#include "url/url_constants.h"
 
 namespace scheme {
 
@@ -25,12 +26,12 @@ void AddInternalSchemes(std::vector<std::string>* standard_schemes) {
 
 bool IsInternalHandledScheme(const std::string& scheme) {
   static const char* schemes[] = {
-    content::kBlobScheme,
+    url::kBlobScheme,
     content::kChromeDevToolsScheme,
     content::kChromeUIScheme,
-    content::kDataScheme,
+    url::kDataScheme,
-    content::kFileScheme,
+    url::kFileScheme,
-    content::kFileSystemScheme,
+    url::kFileSystemScheme,
   };
 
   for (size_t i = 0; i < sizeof(schemes) / sizeof(schemes[0]); ++i) {
@@ -46,13 +47,13 @@ bool IsInternalProtectedScheme(const std::string& scheme) {
   // content/browser/storage_partition_impl_map.cc and are modified by
   // InstallInternalProtectedHandlers().
   static const char* schemes[] = {
-    content::kBlobScheme,
+    url::kBlobScheme,
     content::kChromeUIScheme,
-    content::kDataScheme,
+    url::kDataScheme,
-    content::kFileScheme,
+    url::kFileScheme,
-    content::kFileSystemScheme,
+    url::kFileSystemScheme,
 #if !defined(DISABLE_FTP_SUPPORT)
-    content::kFtpScheme,
+    url::kFtpScheme,
 #endif
   };
 

patch/patch.cfg

@@ -15,7 +15,8 @@ patches = [
     # Fix Xcode 4 build on OS X Lion.
     # http://codereview.chromium.org/8086022/
     #
-    # Don't use aura on Linux.
+    # Disable Warning 4702 ("Unreachable code") for Windows VS builds.
+    # https://code.google.com/p/chromium/issues/detail?id=346399#c55
     'name': 'build',
     'path': '../build/',
   },

patch/patches/build.patch

@@ -1,6 +1,6 @@
 Index: common.gypi
 ===================================================================
---- common.gypi	(revision 272007)
+--- common.gypi	(revision 275973)
 +++ common.gypi	(working copy)
 @@ -9,6 +9,9 @@
    # Variables expected to be overriden on the GYP command line (-D) or by
@@ -12,9 +12,19 @@ Index: common.gypi
      # Putting a variables dict inside another variables dict looks kind of
      # weird.  This is done so that 'host_arch', 'chromeos', etc are defined as
      # variables within the outer variables dict here.  This is necessary
+@@ -5058,6 +5061,9 @@
+           # removed as code is fixed.
+           4100, 4121, 4125, 4127, 4130, 4131, 4189, 4201, 4238, 4244, 4245,
+           4310, 4428, 4481, 4505, 4510, 4512, 4530, 4610, 4611, 4701, 4706,
++          # Disable Warning 4702 ("Unreachable code")
++          # https://code.google.com/p/chromium/issues/detail?id=346399#c55
++          4702,
+         ],
+         'msvs_settings': {
+           'VCCLCompilerTool': {
 Index: mac/strip_save_dsym
 ===================================================================
---- mac/strip_save_dsym	(revision 272007)
+--- mac/strip_save_dsym	(revision 275973)
 +++ mac/strip_save_dsym	(working copy)
 @@ -48,7 +48,7 @@
                   "bundle"]

patch/patches/content_nav_1129.patch

@@ -1,6 +1,6 @@
 Index: public/renderer/content_renderer_client.cc
 ===================================================================
---- public/renderer/content_renderer_client.cc	(revision 272007)
+--- public/renderer/content_renderer_client.cc	(revision 275973)
 +++ public/renderer/content_renderer_client.cc	(working copy)
 @@ -92,7 +92,6 @@
    return false;
@@ -20,7 +20,7 @@ Index: public/renderer/content_renderer_client.cc
                                         const GURL& url,
 Index: public/renderer/content_renderer_client.h
 ===================================================================
---- public/renderer/content_renderer_client.h	(revision 272007)
+--- public/renderer/content_renderer_client.h	(revision 275973)
 +++ public/renderer/content_renderer_client.h	(working copy)
 @@ -176,7 +176,6 @@
    // Returns true if a popup window should be allowed.
@@ -40,9 +40,9 @@ Index: public/renderer/content_renderer_client.h
    // If |send_referrer| is set to false (which is the default), no referrer
 Index: renderer/render_frame_impl.cc
 ===================================================================
---- renderer/render_frame_impl.cc	(revision 272007)
+--- renderer/render_frame_impl.cc	(revision 275973)
 +++ renderer/render_frame_impl.cc	(working copy)
-@@ -3084,7 +3084,6 @@
+@@ -3143,7 +3143,6 @@
      WebNavigationType type,
      WebNavigationPolicy default_policy,
      bool is_redirect) {
@@ -50,7 +50,7 @@ Index: renderer/render_frame_impl.cc
    // The handlenavigation API is deprecated and will be removed once
    // crbug.com/325351 is resolved.
    if (request.url() != GURL(kSwappedOutURL) &&
-@@ -3099,7 +3098,6 @@
+@@ -3158,7 +3157,6 @@
            is_redirect)) {
      return blink::WebNavigationPolicyIgnore;
    }

patch/patches/gritsettings.patch

@@ -1,6 +1,6 @@
 Index: resource_ids
 ===================================================================
---- resource_ids	(revision 272007)
+--- resource_ids	(revision 275973)
 +++ resource_ids	(working copy)
 @@ -16,6 +16,12 @@
  {

patch/patches/gyp_331.patch

@@ -1,6 +1,6 @@
 Index: gyp/generator/ninja.py
 ===================================================================
---- gyp/generator/ninja.py	(revision 1921)
+--- gyp/generator/ninja.py	(revision 1927)
 +++ gyp/generator/ninja.py	(working copy)
 @@ -738,7 +738,16 @@
        for path in copy['files']:

patch/patches/message_loop_443.patch

@@ -1,6 +1,6 @@
 Index: message_loop.cc
 ===================================================================
---- message_loop.cc	(revision 272007)
+--- message_loop.cc	(revision 275973)
 +++ message_loop.cc	(working copy)
 @@ -154,7 +154,7 @@
  MessageLoop::~MessageLoop() {

patch/patches/prefs_content_1161.patch

@@ -1,8 +1,8 @@
 Index: public/common/common_param_traits_macros.h
 ===================================================================
---- public/common/common_param_traits_macros.h	(revision 272007)
+--- public/common/common_param_traits_macros.h	(revision 275973)
 +++ public/common/common_param_traits_macros.h	(working copy)
-@@ -175,6 +175,7 @@
+@@ -177,6 +177,7 @@
    IPC_STRUCT_TRAITS_MEMBER(initialize_at_minimum_page_scale)
    IPC_STRUCT_TRAITS_MEMBER(smart_insert_delete_enabled)
    IPC_STRUCT_TRAITS_MEMBER(compositor_touch_hit_testing)
@@ -12,9 +12,9 @@ Index: public/common/common_param_traits_macros.h
    IPC_STRUCT_TRAITS_MEMBER(spatial_navigation_enabled)
 Index: renderer/web_preferences.cc
 ===================================================================
---- renderer/web_preferences.cc	(revision 272007)
+--- renderer/web_preferences.cc	(revision 275973)
 +++ renderer/web_preferences.cc	(working copy)
-@@ -165,6 +165,8 @@
+@@ -167,6 +167,8 @@
  
    settings->setJavaEnabled(prefs.java_enabled);
  

patch/patches/prefs_webkit_1161.patch

@@ -1,6 +1,6 @@
 Index: common/webpreferences.cc
 ===================================================================
---- common/webpreferences.cc	(revision 272007)
+--- common/webpreferences.cc	(revision 275973)
 +++ common/webpreferences.cc	(working copy)
 @@ -114,6 +114,7 @@
        use_solid_color_scrollbars(false),
@@ -12,9 +12,9 @@ Index: common/webpreferences.cc
  #if defined(OS_ANDROID)
 Index: common/webpreferences.h
 ===================================================================
---- common/webpreferences.h	(revision 272007)
+--- common/webpreferences.h	(revision 275973)
 +++ common/webpreferences.h	(working copy)
-@@ -149,6 +149,7 @@
+@@ -150,6 +150,7 @@
    bool use_solid_color_scrollbars;
    bool compositor_touch_hit_testing;
    bool navigate_on_drag_drop;

patch/patches/public_browser_1161.patch

@@ -1,8 +1,8 @@
 Index: content_browser_client.cc
 ===================================================================
---- content_browser_client.cc	(revision 272007)
+--- content_browser_client.cc	(revision 275973)
 +++ content_browser_client.cc	(working copy)
-@@ -253,6 +253,10 @@
+@@ -252,6 +252,10 @@
    return true;
  }
  
@@ -15,17 +15,17 @@ Index: content_browser_client.cc
  }
 Index: content_browser_client.h
 ===================================================================
---- content_browser_client.h	(revision 272007)
+--- content_browser_client.h	(revision 275973)
 +++ content_browser_client.h	(working copy)
-@@ -22,6 +22,7 @@
+@@ -23,6 +23,7 @@
- #include "net/base/mime_util.h"
  #include "net/cookies/canonical_cookie.h"
+ #include "net/url_request/url_request_interceptor.h"
  #include "net/url_request/url_request_job_factory.h"
 +#include "third_party/skia/include/core/SkColor.h"
  #include "third_party/WebKit/public/web/WebNotificationPresenter.h"
  #include "ui/base/window_open_disposition.h"
  #include "webkit/browser/fileapi/file_system_context.h"
-@@ -535,6 +536,9 @@
+@@ -533,6 +534,9 @@
    // Clears browser cookies.
    virtual void ClearCookies(RenderViewHost* rvh) {}
  

patch/patches/renderer_host_1161.patch

@@ -1,11 +1,11 @@
 Index: compositing_iosurface_layer_mac.mm
 ===================================================================
---- compositing_iosurface_layer_mac.mm	(revision 272007)
+--- compositing_iosurface_layer_mac.mm	(revision 275973)
 +++ compositing_iosurface_layer_mac.mm	(working copy)
-@@ -133,7 +133,7 @@
+@@ -188,7 +188,7 @@
-       !renderWidgetHostView_ ||
+   TRACE_EVENT0("browser", "CompositingIOSurfaceLayer::drawInCGLContext");
-       !renderWidgetHostView_->compositing_iosurface_ ||
+ 
-       !renderWidgetHostView_->compositing_iosurface_->HasIOSurface()) {
+   if (!iosurface_->HasIOSurface() || context_->cgl_context() != glContext) {
 -    glClearColor(1, 1, 1, 1);
 +    glClearColor(0, 0, 0, 0);
      glClear(GL_COLOR_BUFFER_BIT);
@@ -13,9 +13,9 @@ Index: compositing_iosurface_layer_mac.mm
    }
 Index: compositing_iosurface_mac.mm
 ===================================================================
---- compositing_iosurface_mac.mm	(revision 272007)
+--- compositing_iosurface_mac.mm	(revision 275973)
 +++ compositing_iosurface_mac.mm	(working copy)
-@@ -360,7 +360,7 @@
+@@ -350,7 +350,7 @@
      glUseProgram(0); CHECK_AND_SAVE_GL_ERROR();
    } else {
      // Should match the clear color of RenderWidgetHostViewMac.
@@ -26,7 +26,7 @@ Index: compositing_iosurface_mac.mm
  
 Index: compositing_iosurface_shader_programs_mac.cc
 ===================================================================
---- compositing_iosurface_shader_programs_mac.cc	(revision 272007)
+--- compositing_iosurface_shader_programs_mac.cc	(revision 275973)
 +++ compositing_iosurface_shader_programs_mac.cc	(working copy)
 @@ -11,6 +11,8 @@
  #include "base/debug/trace_event.h"
@@ -81,7 +81,7 @@ Index: compositing_iosurface_shader_programs_mac.cc
      shader_programs_[which] =
 Index: compositing_iosurface_shader_programs_mac.h
 ===================================================================
---- compositing_iosurface_shader_programs_mac.h	(revision 272007)
+--- compositing_iosurface_shader_programs_mac.h	(revision 275973)
 +++ compositing_iosurface_shader_programs_mac.h	(working copy)
 @@ -48,6 +48,8 @@
      return rgb_to_yv12_output_format_;
@@ -94,9 +94,9 @@ Index: compositing_iosurface_shader_programs_mac.h
                             TransformsRGBToYV12);
 Index: render_widget_host_view_aura.cc
 ===================================================================
---- render_widget_host_view_aura.cc	(revision 272007)
+--- render_widget_host_view_aura.cc	(revision 275973)
 +++ render_widget_host_view_aura.cc	(working copy)
-@@ -1602,8 +1602,14 @@
+@@ -1675,8 +1675,14 @@
    // For non-opaque windows, we don't draw anything, since we depend on the
    // canvas coming from the compositor to already be initialized as
    // transparent.
@@ -115,50 +115,14 @@ Index: render_widget_host_view_aura.cc
  void RenderWidgetHostViewAura::OnDeviceScaleFactorChanged(
 Index: render_widget_host_view_mac.mm
 ===================================================================
---- render_widget_host_view_mac.mm	(revision 272007)
+--- render_widget_host_view_mac.mm	(revision 275973)
 +++ render_widget_host_view_mac.mm	(working copy)
-@@ -498,7 +498,7 @@
+@@ -493,7 +493,7 @@
-     use_core_animation_ = true;
-     background_layer_.reset([[CALayer alloc] init]);
-     [background_layer_
--        setBackgroundColor:CGColorGetConstantColor(kCGColorWhite)];
-+        setBackgroundColor:CGColorGetConstantColor(kCGColorClear)];
-     [cocoa_view_ setLayer:background_layer_];
-     [cocoa_view_ setWantsLayer:YES];
-   }
-@@ -3304,7 +3304,7 @@
  
-     NSRect r = [self flipRectToNSRect:gfx::Rect(x, y, width, height)];
+   background_layer_.reset([[CALayer alloc] init]);
-     CGContextSetFillColorWithColor(context,
+   [background_layer_
--                                   CGColorGetConstantColor(kCGColorWhite));
+-      setBackgroundColor:CGColorGetConstantColor(kCGColorWhite)];
-+                                   CGColorGetConstantColor(kCGColorClear));
++      setBackgroundColor:CGColorGetConstantColor(kCGColorClear)];
-     CGContextFillRect(context, NSRectToCGRect(r));
+   [cocoa_view_ setLayer:background_layer_];
-   }
+   [cocoa_view_ setWantsLayer:YES];
-   if (damagedRect.bottom() > rect.bottom()) {
-@@ -3326,7 +3326,7 @@
  
-     NSRect r = [self flipRectToNSRect:gfx::Rect(x, y, width, height)];
-     CGContextSetFillColorWithColor(context,
--                                   CGColorGetConstantColor(kCGColorWhite));
-+                                   CGColorGetConstantColor(kCGColorClear));
-     CGContextFillRect(context, NSRectToCGRect(r));
-   }
- }
-@@ -3465,7 +3465,7 @@
-     }
-   } else {
-     CGContextSetFillColorWithColor(context,
--                                   CGColorGetConstantColor(kCGColorWhite));
-+                                   CGColorGetConstantColor(kCGColorClear));
-     CGContextFillRect(context, dirtyRect);
-     if (renderWidgetHostView_->whiteout_start_time_.is_null())
-       renderWidgetHostView_->whiteout_start_time_ = base::TimeTicks::Now();
-@@ -4420,7 +4420,7 @@
- 
- - (id)init {
-   if (self = [super init]) {
--    [self setBackgroundColor:CGColorGetConstantColor(kCGColorWhite)];
-+    [self setBackgroundColor:CGColorGetConstantColor(kCGColorClear)];
-     [self setAnchorPoint:CGPointMake(0, 0)];
-     // Setting contents gravity is necessary to prevent the layer from being
-     // scaled during dyanmic resizes (especially with devtools open).

patch/patches/spi_webcore_364.patch

@@ -1,6 +1,6 @@
 Index: core/frame/FrameView.cpp
 ===================================================================
---- core/frame/FrameView.cpp	(revision 174434)
+--- core/frame/FrameView.cpp	(revision 175829)
 +++ core/frame/FrameView.cpp	(working copy)
 @@ -165,8 +165,10 @@
      if (!m_frame->isMainFrame())
@@ -15,7 +15,7 @@ Index: core/frame/FrameView.cpp
  PassRefPtr<FrameView> FrameView::create(LocalFrame* frame)
 Index: platform/scroll/ScrollbarThemeMacCommon.mm
 ===================================================================
---- platform/scroll/ScrollbarThemeMacCommon.mm	(revision 174434)
+--- platform/scroll/ScrollbarThemeMacCommon.mm	(revision 175829)
 +++ platform/scroll/ScrollbarThemeMacCommon.mm	(working copy)
 @@ -358,10 +358,14 @@
  // static

patch/patches/underlay_1051.patch

@@ -1,6 +1,6 @@
 Index: underlay_opengl_hosting_window.h
 ===================================================================
---- underlay_opengl_hosting_window.h	(revision 272007)
+--- underlay_opengl_hosting_window.h	(revision 275973)
 +++ underlay_opengl_hosting_window.h	(working copy)
 @@ -12,7 +12,7 @@
  // Common base class for windows that host a OpenGL surface that renders under

patch/patches/views_widget_180.patch

@@ -1,6 +1,6 @@
 Index: desktop_aura/desktop_screen_win.cc
 ===================================================================
---- desktop_aura/desktop_screen_win.cc	(revision 272007)
+--- desktop_aura/desktop_screen_win.cc	(revision 275973)
 +++ desktop_aura/desktop_screen_win.cc	(working copy)
 @@ -54,6 +54,8 @@
  }
@@ -13,7 +13,7 @@ Index: desktop_aura/desktop_screen_win.cc
  }
 Index: desktop_aura/desktop_window_tree_host_win.cc
 ===================================================================
---- desktop_aura/desktop_window_tree_host_win.cc	(revision 272007)
+--- desktop_aura/desktop_window_tree_host_win.cc	(revision 275973)
 +++ desktop_aura/desktop_window_tree_host_win.cc	(working copy)
 @@ -129,7 +129,9 @@
                          native_widget_delegate_);
@@ -26,7 +26,7 @@ Index: desktop_aura/desktop_window_tree_host_win.cc
      parent_hwnd = params.parent->GetHost()->GetAcceleratedWidget();
  
    message_handler_->set_remove_standard_frame(params.remove_standard_frame);
-@@ -775,6 +777,7 @@
+@@ -770,6 +772,7 @@
  
  void DesktopWindowTreeHostWin::HandleNativeFocus(HWND last_focused_window) {
    // TODO(beng): inform the native_widget_delegate_.
@@ -34,7 +34,7 @@ Index: desktop_aura/desktop_window_tree_host_win.cc
    InputMethod* input_method = GetInputMethod();
    if (input_method)
      input_method->OnFocus();
-@@ -782,6 +785,7 @@
+@@ -777,6 +780,7 @@
  
  void DesktopWindowTreeHostWin::HandleNativeBlur(HWND focused_window) {
    // TODO(beng): inform the native_widget_delegate_.
@@ -44,9 +44,9 @@ Index: desktop_aura/desktop_window_tree_host_win.cc
      input_method->OnBlur();
 Index: desktop_aura/desktop_window_tree_host_x11.cc
 ===================================================================
---- desktop_aura/desktop_window_tree_host_x11.cc	(revision 272007)
+--- desktop_aura/desktop_window_tree_host_x11.cc	(revision 275973)
 +++ desktop_aura/desktop_window_tree_host_x11.cc	(working copy)
-@@ -143,7 +143,8 @@
+@@ -148,7 +148,8 @@
        window_parent_(NULL),
        window_shape_(NULL),
        custom_window_shape_(false),
@@ -56,7 +56,7 @@ Index: desktop_aura/desktop_window_tree_host_x11.cc
  }
  
  DesktopWindowTreeHostX11::~DesktopWindowTreeHostX11() {
-@@ -332,7 +333,8 @@
+@@ -337,7 +338,8 @@
    // Actually free our native resources.
    if (ui::PlatformEventSource::GetInstance())
      ui::PlatformEventSource::GetInstance()->RemovePlatformEventDispatcher(this);
@@ -66,7 +66,7 @@ Index: desktop_aura/desktop_window_tree_host_x11.cc
    xwindow_ = None;
  
    desktop_native_widget_aura_->OnHostClosed();
-@@ -998,9 +1000,13 @@
+@@ -1027,9 +1029,13 @@
      }
    }
  
@@ -81,7 +81,7 @@ Index: desktop_aura/desktop_window_tree_host_x11.cc
        bounds_.x(), bounds_.y(),
        bounds_.width(), bounds_.height(),
        0,               // border width
-@@ -1503,6 +1509,10 @@
+@@ -1554,6 +1560,10 @@
        }
        break;
      }
@@ -94,9 +94,9 @@ Index: desktop_aura/desktop_window_tree_host_x11.cc
          ReleaseCapture();
 Index: desktop_aura/desktop_window_tree_host_x11.h
 ===================================================================
---- desktop_aura/desktop_window_tree_host_x11.h	(revision 272007)
+--- desktop_aura/desktop_window_tree_host_x11.h	(revision 275973)
 +++ desktop_aura/desktop_window_tree_host_x11.h	(working copy)
-@@ -319,6 +319,9 @@
+@@ -322,6 +322,9 @@
    // the frame when |xwindow_| gains focus or handles a mouse button event.
    bool urgency_hint_set_;
  
@@ -108,7 +108,7 @@ Index: desktop_aura/desktop_window_tree_host_x11.h
  
 Index: widget.cc
 ===================================================================
---- widget.cc	(revision 272007)
+--- widget.cc	(revision 275973)
 +++ widget.cc	(working copy)
 @@ -116,6 +116,7 @@
        show_state(ui::SHOW_STATE_DEFAULT),
@@ -117,16 +117,25 @@ Index: widget.cc
 +      parent_widget(gfx::kNullAcceleratedWidget),
        native_widget(NULL),
        desktop_window_tree_host(NULL),
-       top_level(false),
+       layer_type(aura::WINDOW_LAYER_TEXTURED),
-@@ -141,6 +142,7 @@
+@@ -140,6 +141,7 @@
        show_state(ui::SHOW_STATE_DEFAULT),
        double_buffer(false),
        parent(NULL),
 +      parent_widget(gfx::kNullAcceleratedWidget),
        native_widget(NULL),
        desktop_window_tree_host(NULL),
-       top_level(false),
+       layer_type(aura::WINDOW_LAYER_TEXTURED),
-@@ -398,7 +400,12 @@
+@@ -314,7 +316,7 @@
+   InitParams params = in_params;
+ 
+   params.child |= (params.type == InitParams::TYPE_CONTROL);
+-  is_top_level_ = !params.child;
++  is_top_level_ = !params.child || params.parent_widget;
+ 
+   if (params.opacity == views::Widget::InitParams::INFER_OPACITY &&
+       params.type != views::Widget::InitParams::TYPE_WINDOW &&
+@@ -376,7 +378,12 @@
        Minimize();
    } else if (params.delegate) {
      SetContentsView(params.delegate->GetContentsView());
@@ -142,9 +151,9 @@ Index: widget.cc
  }
 Index: widget.h
 ===================================================================
---- widget.h	(revision 272007)
+--- widget.h	(revision 275973)
 +++ widget.h	(working copy)
-@@ -213,6 +213,7 @@
+@@ -222,6 +222,7 @@
      // Should the widget be double buffered? Default is false.
      bool double_buffer;
      gfx::NativeView parent;

patch/patches/webkit_933.patch

@@ -1,6 +1,6 @@
 Index: WebNode.cpp
 ===================================================================
---- WebNode.cpp	(revision 174434)
+--- WebNode.cpp	(revision 175829)
 +++ WebNode.cpp	(working copy)
 @@ -172,7 +172,7 @@
  void WebNode::addEventListener(const WebString& eventType, WebDOMEventListener* listener, bool useCapture)

patch/patches/wtf_vector_377942.patch

@@ -1,8 +1,8 @@
 Index: Vector.h
 ===================================================================
---- Vector.h	(revision 174434)
+--- Vector.h	(revision 175829)
 +++ Vector.h	(working copy)
-@@ -221,7 +221,10 @@
+@@ -224,7 +224,10 @@
      {
          static bool compare(const T* a, const T* b, size_t size)
          {

patch/patches/zlib.patch

@@ -1,6 +1,6 @@
 Index: contrib/minizip/unzip.c
 ===================================================================
---- contrib/minizip/unzip.c	(revision 272007)
+--- contrib/minizip/unzip.c	(revision 275973)
 +++ contrib/minizip/unzip.c	(working copy)
 @@ -69,7 +69,7 @@
  #include <string.h>