Update to Chromium revision 184577.

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

cef1/CHROMIUM_BUILD_COMPATIBILITY.txt

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

cef1/libcef/browser_appcache_system.h

@@ -6,7 +6,7 @@
 #define CEF_LIBCEF_BROWSER_APPCACHE_SYSTEM_H_
 #pragma once
 
-#include "base/file_path.h"
+#include "base/files/file_path.h"
 #include "base/message_loop.h"
 #include "base/threading/thread.h"
 #include "webkit/appcache/appcache_backend_impl.h"

cef1/libcef/browser_database_system.cc

@@ -289,7 +289,7 @@ void BrowserDatabaseSystem::VfsGetSpaceAvailable(
   done_event->Signal();
 }
 
-FilePath BrowserDatabaseSystem::GetFullFilePathForVfsFile(
+base::FilePath BrowserDatabaseSystem::GetFullFilePathForVfsFile(
     const string16& vfs_file_name) {
   DCHECK(db_thread_proxy_->BelongsToCurrentThread());
   if (vfs_file_name.empty())  // temp file, used for vacuuming

cef1/libcef/browser_database_system.h

@@ -6,7 +6,7 @@
 #define CEF_LIBCEF_BROWSER_DATABASE_SYSTEM_H_
 #pragma once
 
-#include "base/file_path.h"
+#include "base/files/file_path.h"
 #include "base/hash_tables.h"
 #include "base/memory/ref_counted.h"
 #include "base/platform_file.h"

cef1/libcef/browser_file_system.cc

@@ -8,17 +8,17 @@
 #include "libcef/cef_thread.h"
 
 #include "base/bind.h"
-#include "base/file_path.h"
+#include "base/files/file_path.h"
 #include "base/message_loop.h"
 #include "base/message_loop_proxy.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/mime_util.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebFileInfo.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebVector.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebFileInfo.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFileSystemCallbacks.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFileSystemEntry.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
@@ -26,6 +26,8 @@
 #include "webkit/base/file_path_string_conversions.h"
 #include "webkit/blob/blob_storage_controller.h"
 #include "webkit/fileapi/external_mount_points.h"
+#include "webkit/fileapi/file_permission_policy.h"
+#include "webkit/fileapi/file_system_mount_point_provider.h"
 #include "webkit/fileapi/file_system_task_runners.h"
 #include "webkit/fileapi/file_system_url.h"
 #include "webkit/fileapi/file_system_util.h"
@@ -137,8 +139,8 @@ void BrowserFileSystem::move(
     const WebURL& dest_path, WebFileSystemCallbacks* callbacks) {
   FileSystemURL src_url(file_system_context()->CrackURL(src_path));
   FileSystemURL dest_url(file_system_context()->CrackURL(dest_path));
-  if (!HasFilePermission(src_url, FILE_PERMISSION_WRITE) ||
-      !HasFilePermission(dest_url, FILE_PERMISSION_CREATE)) {
+  if (!HasFilePermission(src_url, fileapi::kWriteFilePermissions) ||
+      !HasFilePermission(dest_url, fileapi::kCreateFilePermissions)) {
     callbacks->didFail(WebKit::WebFileErrorSecurity);
     return;
   }
@@ -151,8 +153,8 @@ void BrowserFileSystem::copy(
     WebFileSystemCallbacks* callbacks) {
   FileSystemURL src_url(file_system_context()->CrackURL(src_path));
   FileSystemURL dest_url(file_system_context()->CrackURL(dest_path));
-  if (!HasFilePermission(src_url, FILE_PERMISSION_READ) ||
-      !HasFilePermission(dest_url, FILE_PERMISSION_CREATE)) {
+  if (!HasFilePermission(src_url, fileapi::kReadFilePermissions) ||
+      !HasFilePermission(dest_url, fileapi::kCreateFilePermissions)) {
     callbacks->didFail(WebKit::WebFileErrorSecurity);
     return;
   }
@@ -163,7 +165,7 @@ void BrowserFileSystem::copy(
 void BrowserFileSystem::remove(
     const WebURL& path, WebFileSystemCallbacks* callbacks) {
   FileSystemURL url(file_system_context()->CrackURL(path));
-  if (!HasFilePermission(url, FILE_PERMISSION_WRITE)) {
+  if (!HasFilePermission(url, fileapi::kWriteFilePermissions)) {
     callbacks->didFail(WebKit::WebFileErrorSecurity);
     return;
   }
@@ -174,7 +176,7 @@ void BrowserFileSystem::remove(
 void BrowserFileSystem::removeRecursively(
     const WebURL& path, WebFileSystemCallbacks* callbacks) {
   FileSystemURL url(file_system_context()->CrackURL(path));
-  if (!HasFilePermission(url, FILE_PERMISSION_WRITE)) {
+  if (!HasFilePermission(url, fileapi::kWriteFilePermissions)) {
     callbacks->didFail(WebKit::WebFileErrorSecurity);
     return;
   }
@@ -185,7 +187,7 @@ void BrowserFileSystem::removeRecursively(
 void BrowserFileSystem::readMetadata(
     const WebURL& path, WebFileSystemCallbacks* callbacks) {
   FileSystemURL url(file_system_context()->CrackURL(path));
-  if (!HasFilePermission(url, FILE_PERMISSION_READ)) {
+  if (!HasFilePermission(url, fileapi::kReadFilePermissions)) {
     callbacks->didFail(WebKit::WebFileErrorSecurity);
     return;
   }
@@ -195,7 +197,7 @@ void BrowserFileSystem::readMetadata(
 void BrowserFileSystem::createFile(
     const WebURL& path, bool exclusive, WebFileSystemCallbacks* callbacks) {
   FileSystemURL url(file_system_context()->CrackURL(path));
-  if (!HasFilePermission(url, FILE_PERMISSION_CREATE)) {
+  if (!HasFilePermission(url, fileapi::kCreateFilePermissions)) {
     callbacks->didFail(WebKit::WebFileErrorSecurity);
     return;
   }
@@ -205,7 +207,7 @@ void BrowserFileSystem::createFile(
 void BrowserFileSystem::createDirectory(
     const WebURL& path, bool exclusive, WebFileSystemCallbacks* callbacks) {
   FileSystemURL url(file_system_context()->CrackURL(path));
-  if (!HasFilePermission(url, FILE_PERMISSION_CREATE)) {
+  if (!HasFilePermission(url, fileapi::kCreateFilePermissions)) {
     callbacks->didFail(WebKit::WebFileErrorSecurity);
     return;
   }
@@ -216,7 +218,7 @@ void BrowserFileSystem::createDirectory(
 void BrowserFileSystem::fileExists(
     const WebURL& path, WebFileSystemCallbacks* callbacks) {
   FileSystemURL url(file_system_context()->CrackURL(path));
-  if (!HasFilePermission(url, FILE_PERMISSION_READ)) {
+  if (!HasFilePermission(url, fileapi::kReadFilePermissions)) {
     callbacks->didFail(WebKit::WebFileErrorSecurity);
     return;
   }
@@ -226,7 +228,7 @@ void BrowserFileSystem::fileExists(
 void BrowserFileSystem::directoryExists(
     const WebURL& path, WebFileSystemCallbacks* callbacks) {
   FileSystemURL url(file_system_context()->CrackURL(path));
-  if (!HasFilePermission(url, FILE_PERMISSION_READ)) {
+  if (!HasFilePermission(url, fileapi::kReadFilePermissions)) {
     callbacks->didFail(WebKit::WebFileErrorSecurity);
     return;
   }
@@ -236,7 +238,7 @@ void BrowserFileSystem::directoryExists(
 void BrowserFileSystem::readDirectory(
     const WebURL& path, WebFileSystemCallbacks* callbacks) {
   FileSystemURL url(file_system_context()->CrackURL(path));
-  if (!HasFilePermission(url, FILE_PERMISSION_READ)) {
+  if (!HasFilePermission(url, fileapi::kReadFilePermissions)) {
     callbacks->didFail(WebKit::WebFileErrorSecurity);
     return;
   }
@@ -249,16 +251,29 @@ WebFileWriter* BrowserFileSystem::createFileWriter(
 }
 
 void BrowserFileSystem::createSnapshotFileAndReadMetadata(
-    const WebURL& blobURL,
     const WebURL& path,
     WebFileSystemCallbacks* callbacks) {
   FileSystemURL url(file_system_context()->CrackURL(path));
-  if (!HasFilePermission(url, FILE_PERMISSION_READ)) {
+  if (!HasFilePermission(url, fileapi::kReadFilePermissions)) {
     callbacks->didFail(WebKit::WebFileErrorSecurity);
     return;
   }
   GetNewOperation(url)->CreateSnapshotFile(
-      url, SnapshotFileHandler(blobURL, callbacks));
+      url, SnapshotFileHandler(callbacks));
+}
+
+// DEPRECATED
+void BrowserFileSystem::createSnapshotFileAndReadMetadata(
+    const WebURL& blobURL,
+    const WebURL& path,
+    WebFileSystemCallbacks* callbacks) {
+  FileSystemURL url(file_system_context()->CrackURL(path));
+  if (!HasFilePermission(url, fileapi::kReadFilePermissions)) {
+    callbacks->didFail(WebKit::WebFileErrorSecurity);
+    return;
+  }
+  GetNewOperation(url)->CreateSnapshotFile(
+      url, SnapshotFileHandler_Deprecated(blobURL, callbacks));
 }
 
 // static
@@ -275,10 +290,16 @@ void BrowserFileSystem::CleanupOnIOThread() {
 }
 
 bool BrowserFileSystem::HasFilePermission(
-    const fileapi::FileSystemURL& url, FilePermission permission) {
-  // Disallow writing on dragged file system, otherwise return ok.
-  return (url.type() != fileapi::kFileSystemTypeDragged ||
-          permission == FILE_PERMISSION_READ);
+    const fileapi::FileSystemURL& url, int permissions) {
+  if (!url.is_valid())
+    return false;
+  fileapi::FileSystemMountPointProvider* mount_point_provider =
+      file_system_context_->GetMountPointProvider(url.type());
+  DCHECK(mount_point_provider);
+  // In test_shell we don't perform further detailed security checks if it's
+  // not specifically forbidden by ALWAYS_DENY.
+  return (mount_point_provider->GetPermissionPolicy(url, permissions)
+      != fileapi::FILE_PERMISSION_ALWAYS_DENY);
 }
 
 FileSystemOperation* BrowserFileSystem::GetNewOperation(
@@ -317,9 +338,17 @@ BrowserFileSystem::DeleteFileSystemHandler(WebFileSystemCallbacks* callbacks) {
 }
 
 FileSystemOperation::SnapshotFileCallback
-BrowserFileSystem::SnapshotFileHandler(const GURL& blob_url,
-                                      WebFileSystemCallbacks* callbacks) {
+BrowserFileSystem::SnapshotFileHandler(
+    WebFileSystemCallbacks* callbacks) {
   return base::Bind(&BrowserFileSystem::DidCreateSnapshotFile,
+                    AsWeakPtr(), base::Unretained(callbacks));
+}
+
+FileSystemOperation::SnapshotFileCallback
+BrowserFileSystem::SnapshotFileHandler_Deprecated(
+    const GURL& blob_url,
+    WebFileSystemCallbacks* callbacks) {
+  return base::Bind(&BrowserFileSystem::DidCreateSnapshotFile_Deprecated,
                     AsWeakPtr(), blob_url, base::Unretained(callbacks));
 }
 
@@ -394,6 +423,26 @@ void BrowserFileSystem::DidDeleteFileSystem(
 }
 
 void BrowserFileSystem::DidCreateSnapshotFile(
+    WebFileSystemCallbacks* callbacks,
+    base::PlatformFileError result,
+    const base::PlatformFileInfo& info,
+    const base::FilePath& platform_path,
+    const scoped_refptr<webkit_blob::ShareableFileReference>& file_ref) {
+  if (result == base::PLATFORM_FILE_OK) {
+    WebFileInfo web_file_info;
+    web_file_info.length = info.size;
+    web_file_info.modificationTime = info.last_modified.ToDoubleT();
+    web_file_info.type = info.is_directory ?
+        WebFileInfo::TypeDirectory : WebFileInfo::TypeFile;
+    web_file_info.platformPath =
+        webkit_base::FilePathToWebString(platform_path);
+    callbacks->didCreateSnapshotFile(web_file_info);
+  } else {
+    callbacks->didFail(fileapi::PlatformFileErrorToWebFileError(result));
+  }
+}
+
+void BrowserFileSystem::DidCreateSnapshotFile_Deprecated(
     const GURL& blob_url,
     WebFileSystemCallbacks* callbacks,
     base::PlatformFileError result,

cef1/libcef/browser_file_system.h

@@ -90,25 +90,23 @@ class BrowserFileSystem
       WebKit::WebFileSystemCallbacks*) OVERRIDE;
   virtual WebKit::WebFileWriter* createFileWriter(
       const WebKit::WebURL& path, WebKit::WebFileWriterClient*) OVERRIDE;
+  virtual void createSnapshotFileAndReadMetadata(
+      const WebKit::WebURL& path,
+      WebKit::WebFileSystemCallbacks* callbacks);
+
+  // DEPRECATED
   virtual void createSnapshotFileAndReadMetadata(
       const WebKit::WebURL& blobURL,
       const WebKit::WebURL& path,
-      WebKit::WebFileSystemCallbacks* callbacks) OVERRIDE;
+      WebKit::WebFileSystemCallbacks* callbacks);
 
   static void InitializeOnIOThread(
       webkit_blob::BlobStorageController* blob_storage_controller);
   static void CleanupOnIOThread();
 
  private:
-  enum FilePermission {
-    FILE_PERMISSION_READ,
-    FILE_PERMISSION_WRITE,
-    FILE_PERMISSION_CREATE,
-  };
-
   // Helpers.
-  bool HasFilePermission(const fileapi::FileSystemURL& url,
-                         FilePermission permission);
+  bool HasFilePermission(const fileapi::FileSystemURL& url, int permissions);
   fileapi::FileSystemOperation* GetNewOperation(
       const fileapi::FileSystemURL& url);
 
@@ -124,8 +122,11 @@ class BrowserFileSystem
   fileapi::FileSystemContext::DeleteFileSystemCallback DeleteFileSystemHandler(
       WebKit::WebFileSystemCallbacks* callbacks);
   fileapi::FileSystemOperation::SnapshotFileCallback
-      SnapshotFileHandler(const GURL& blob_url,
-                          WebKit::WebFileSystemCallbacks* callbacks);
+      SnapshotFileHandler(WebKit::WebFileSystemCallbacks* callbacks);
+  fileapi::FileSystemOperation::SnapshotFileCallback
+      SnapshotFileHandler_Deprecated(
+          const GURL& blob_url,
+          WebKit::WebFileSystemCallbacks* callbacks);
   void DidFinish(WebKit::WebFileSystemCallbacks* callbacks,
                  base::PlatformFileError result);
   void DidGetMetadata(WebKit::WebFileSystemCallbacks* callbacks,
@@ -143,6 +144,12 @@ class BrowserFileSystem
   void DidDeleteFileSystem(WebKit::WebFileSystemCallbacks* callbacks,
                            base::PlatformFileError result);
   void DidCreateSnapshotFile(
+      WebKit::WebFileSystemCallbacks* callbacks,
+      base::PlatformFileError result,
+      const base::PlatformFileInfo& info,
+      const base::FilePath& platform_path,
+      const scoped_refptr<webkit_blob::ShareableFileReference>& file_ref);
+  void DidCreateSnapshotFile_Deprecated(
       const GURL& blob_url,
       WebKit::WebFileSystemCallbacks* callbacks,
       base::PlatformFileError result,

cef1/libcef/browser_impl.cc

@@ -14,7 +14,7 @@
 #include "libcef/v8_impl.h"
 
 #include "base/bind.h"
-#include "base/file_path.h"
+#include "base/files/file_path.h"
 #include "base/path_service.h"
 #include "base/stringprintf.h"
 #include "base/synchronization/waitable_event.h"

cef1/libcef/browser_request_context.cc

@@ -15,7 +15,7 @@
 #include "libcef/cef_thread.h"
 
 #include "base/compiler_specific.h"
-#include "base/file_path.h"
+#include "base/files/file_path.h"
 #include "base/file_util.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/threading/worker_pool.h"
@@ -36,8 +36,8 @@
 #include "net/proxy/proxy_service.h"
 #include "net/url_request/http_user_agent_settings.h"
 #include "net/url_request/url_request_job_factory_impl.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/Platform.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebKitPlatformSupport.h"
 #include "webkit/blob/blob_storage_controller.h"
 #include "webkit/blob/blob_url_request_job_factory.h"
 #include "webkit/fileapi/file_system_context.h"
@@ -265,7 +265,9 @@ void BrowserRequestContext::Init(
   storage_.set_ftp_transaction_factory(
       new net::FtpNetworkLayer(host_resolver()));
 
-  net::URLRequestJobFactory* job_factory = new net::URLRequestJobFactoryImpl();
+  net::URLRequestJobFactoryImpl* job_factory =
+      new net::URLRequestJobFactoryImpl();
+  job_factory_impl_ = job_factory;
 
   BrowserFileSystem* file_system = _Context->file_system();
   // Create the context if it doesn't already exist.

cef1/libcef/browser_request_context.h

@@ -19,6 +19,10 @@ namespace base {
 class FilePath;
 }
 
+namespace net {
+class URLRequestJobFactoryImpl;
+}
+
 namespace webkit_blob {
 class BlobStorageController;
 }
@@ -44,6 +48,9 @@ class BrowserRequestContext : public net::URLRequestContext {
   webkit_blob::BlobStorageController* blob_storage_controller() const {
     return blob_storage_controller_.get();
   }
+  net::URLRequestJobFactoryImpl* job_factory_impl() const {
+    return job_factory_impl_;
+  };
 
  private:
   void Init(const base::FilePath& cache_path, net::HttpCache::Mode cache_mode,
@@ -54,6 +61,7 @@ class BrowserRequestContext : public net::URLRequestContext {
   scoped_ptr<net::URLSecurityManager> url_security_manager_;
   scoped_ptr<net::URLRequest::Interceptor> url_request_interceptor_;
   base::FilePath cookie_store_path_;
+  net::URLRequestJobFactoryImpl* job_factory_impl_;
 };
 
 #endif  // CEF_LIBCEF_BROWSER_REQUEST_CONTEXT_H_

cef1/libcef/browser_resource_loader_bridge.cc

@@ -42,7 +42,7 @@
 #include "libcef/http_header_utils.h"
 
 #include "base/bind.h"
-#include "base/file_path.h"
+#include "base/files/file_path.h"
 #include "base/file_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop.h"

cef1/libcef/browser_webkit_init.h

@@ -25,6 +25,10 @@
 
 class BrowserPrerenderingSupport;
 
+namespace WebKit {
+class WebIDBFactory;
+}
+
 class BrowserWebKitInit : public webkit_glue::WebKitPlatformSupportImpl {
  public:
   BrowserWebKitInit();
@@ -65,7 +69,7 @@ class BrowserWebKitInit : public webkit_glue::WebKitPlatformSupportImpl {
   virtual WebKit::WebString defaultLocale() OVERRIDE;
   virtual WebKit::WebStorageNamespace* createLocalStorageNamespace(
       const WebKit::WebString& path, unsigned quota) OVERRIDE;
-  virtual WebKit::WebIDBFactory* idbFactory() OVERRIDE;
+  virtual WebKit::WebIDBFactory* idbFactory();
   virtual WebKit::WebGraphicsContext3D* createOffscreenGraphicsContext3D(
       const WebKit::WebGraphicsContext3D::Attributes& attributes) OVERRIDE;
   virtual string16 GetLocalizedString(int message_id) OVERRIDE;

cef1/libcef/browser_webview_delegate.cc

@@ -31,6 +31,7 @@
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "net/base/net_errors.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/Platform.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebCString.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebData.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebPoint.h"
@@ -50,7 +51,6 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebHistoryItem.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIconURL.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebKitPlatformSupport.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebNode.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginParams.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRange.h"

cef1/libcef/cef_context.cc

@@ -84,8 +84,9 @@ class CefResourceBundleDelegate : public ui::ResourceBundle::Delegate {
     return base::FilePath();
   }
 
-  virtual base::FilePath GetPathForLocalePack(const FilePath& pack_path,
-                                        const std::string& locale) OVERRIDE {
+  virtual base::FilePath GetPathForLocalePack(
+      const base::FilePath& pack_path,
+      const std::string& locale) OVERRIDE {
     if (!context_->settings().pack_loading_disabled)
       return pack_path;
     return base::FilePath();

cef1/libcef/cef_context.h

@@ -18,7 +18,7 @@
 
 #include "base/at_exit.h"
 #include "base/atomic_sequence_num.h"
-#include "base/file_path.h"
+#include "base/files/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/threading/sequenced_worker_pool.h"

cef1/libcef/cef_process_ui_thread.cc

@@ -76,7 +76,7 @@ void CefProcessUIThread::Init() {
     logging::SetMinLogLevel(settings.log_severity);
   }
 
-  base::FilePath log_file = FilePath(CefString(&settings.log_file));
+  base::FilePath log_file = base::FilePath(CefString(&settings.log_file));
   logging::DcheckState dcheck_state =
       logging::DISABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS;
   if (settings.release_dcheck_enabled)

cef1/libcef/command_line_impl.cc

@@ -4,7 +4,7 @@
 
 #include "include/cef_command_line.h"
 #include "base/command_line.h"
-#include "base/file_path.h"
+#include "base/files/file_path.h"
 #include "base/logging.h"
 
 namespace {

cef1/libcef/cookie_manager_impl.h

@@ -6,7 +6,7 @@
 #define CEF_LIBCEF_COOKIE_IMPL_H_
 
 #include "include/cef_cookie.h"
-#include "base/file_path.h"
+#include "base/files/file_path.h"
 #include "net/cookies/cookie_monster.h"
 
 // Implementation of the CefCookieManager interface.

cef1/libcef/download_util.cc

@@ -5,7 +5,7 @@
 
 #include "libcef/download_util.h"
 
-#include "base/file_path.h"
+#include "base/files/file_path.h"
 #include "base/string16.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"

cef1/libcef/drag_data_impl.cc

@@ -3,7 +3,7 @@
 // can be found in the LICENSE file.
 
 #include "libcef/drag_data_impl.h"
-#include "base/file_path.h"
+#include "base/files/file_path.h"
 
 CefDragDataImpl::CefDragDataImpl(const WebDropData& data)
   : data_(data) {

cef1/libcef/drag_download_file.h

@@ -9,7 +9,7 @@
 
 #include <string>
 
-#include "base/file_path.h"
+#include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/run_loop.h"

cef1/libcef/drag_download_util.cc

@@ -7,7 +7,7 @@
 
 #include "base/bind.h"
 #include "base/string_util.h"
-#include "base/file_path.h"
+#include "base/files/file_path.h"
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string_number_conversions.h"

cef1/libcef/request_impl.cc

@@ -558,7 +558,7 @@ void CefPostDataElementImpl::Get(net::UploadElement& element) {
   if (type_ == PDE_TYPE_BYTES) {
     element.SetToBytes(static_cast<char*>(data_.bytes.bytes), data_.bytes.size);
   } else if (type_ == PDE_TYPE_FILE) {
-    base::FilePath path = FilePath(CefString(&data_.filename));
+    base::FilePath path = base::FilePath(CefString(&data_.filename));
     element.SetToFilePath(path);
   } else {
     NOTREACHED();

cef1/libcef/scheme_impl.cc

@@ -38,7 +38,7 @@
 #include "net/url_request/url_request_ftp_job.h"
 #include "net/url_request/url_request_http_job.h"
 #include "net/url_request/url_request_job.h"
-#include "net/url_request/url_request_job_factory.h"
+#include "net/url_request/url_request_job_factory_impl.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebString.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityPolicy.h"
 
@@ -623,9 +623,8 @@ class CefUrlRequestManager {
 
     handler_map_[make_pair(scheme_lower, domain_lower)] = factory;
 
-    net::URLRequestJobFactory* job_factory =
-        const_cast<net::URLRequestJobFactory*>(
-            _Context->request_context()->job_factory());
+    net::URLRequestJobFactoryImpl* job_factory =
+        _Context->request_context()->job_factory_impl();
 
     job_factory->SetProtocolHandler(scheme_lower,
                                     new ProtocolHandler(scheme_lower));
@@ -654,9 +653,8 @@ class CefUrlRequestManager {
   void ClearFactories() {
     REQUIRE_IOT();
 
-    net::URLRequestJobFactory* job_factory =
-        const_cast<net::URLRequestJobFactory*>(
-            _Context->request_context()->job_factory());
+    net::URLRequestJobFactoryImpl* job_factory =
+        _Context->request_context()->job_factory_impl();
 
     // Unregister with the ProtocolFactory.
     std::set<std::string> schemes;

cef1/libcef/web_drag_source_gtk.h

@@ -7,7 +7,7 @@
 #define CEF_LIBCEF_WEB_DRAG_SOURCE_GTK_H_
 
 #include <gtk/gtk.h>
-#include "base/file_path.h"
+#include "base/files/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"

cef1/libcef/web_drag_source_mac.h

@@ -9,7 +9,7 @@
 
 #import <Cocoa/Cocoa.h>
 
-#include "base/file_path.h"
+#include "base/files/file_path.h"
 #include "base/memory/scoped_nsobject.h"
 #include "base/memory/scoped_ptr.h"
 #include "googleurl/src/gurl.h"

cef1/libcef/web_drag_source_mac.mm

@@ -12,7 +12,7 @@
 #include "libcef/download_util.h"
 #import "libcef/web_drag_source_mac.h"
 
-#include "base/file_path.h"
+#include "base/files/file_path.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #include "base/threading/thread.h"

cef1/libcef/web_plugin_impl.cc

@@ -6,7 +6,7 @@
 #include "libcef/cef_context.h"
 #include "libcef/cef_thread.h"
 
-#include "base/file_path.h"
+#include "base/files/file_path.h"
 #include "base/string_util.h"
 #include "webkit/plugins/npapi/plugin_list.h"
 

cef1/patch/patches/spi_webcore_364.patch

@@ -1,8 +1,8 @@
 Index: page/FrameView.cpp
 ===================================================================
---- page/FrameView.cpp	(revision 137939)
+--- page/FrameView.cpp	(revision 143980)
 +++ page/FrameView.cpp	(working copy)
-@@ -209,10 +209,12 @@
+@@ -208,10 +208,12 @@
      if (!page)
          return;
  
@@ -17,7 +17,7 @@ Index: page/FrameView.cpp
  PassRefPtr<FrameView> FrameView::create(Frame* frame)
 Index: platform/mac/NSScrollerImpDetails.mm
 ===================================================================
---- platform/mac/NSScrollerImpDetails.mm	(revision 137939)
+--- platform/mac/NSScrollerImpDetails.mm	(revision 143980)
 +++ platform/mac/NSScrollerImpDetails.mm	(working copy)
 @@ -34,6 +34,7 @@
  #if PLATFORM(CHROMIUM)

cef1/patch/patches/tools_gyp.patch

@@ -1,8 +1,8 @@
 Index: pylib/gyp/input.py
 ===================================================================
---- pylib/gyp/input.py	(revision 1556)
+--- pylib/gyp/input.py	(revision 1583)
 +++ pylib/gyp/input.py	(working copy)
-@@ -857,7 +857,8 @@
+@@ -843,7 +843,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.