Update to Chromium revision 5fdc0fab (#520840)

- Windows now builds with clang by default.

libcef/browser/extensions/api/tabs/tabs_api.cc

@@ -231,7 +231,8 @@ bool ExecuteCodeInTabFunction::LoadFile(const std::string& file) {
 void ExecuteCodeInTabFunction::LoadFileComplete(
     const std::string& file,
     std::unique_ptr<std::string> data) {
-  DidLoadAndLocalizeFile(file, !!data.get(), std::move(data));
+  const bool success = !!data.get();
+  DidLoadAndLocalizeFile(file, success, std::move(data));
 }
 
 bool TabsExecuteScriptFunction::ShouldInsertCSS() const {

libcef/browser/extensions/browser_context_keyed_service_factories.cc

@@ -6,6 +6,9 @@
 
 #include "chrome/browser/content_settings/cookie_settings_factory.h"
 #include "chrome/browser/extensions/api/streams_private/streams_private_api.h"
+#include "chrome/browser/plugins/plugin_prefs_factory.h"
+#include "chrome/browser/spellchecker/spellcheck_factory.h"
+#include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/browser/ui/prefs/prefs_tab_helper.h"
 #include "extensions/browser/api/alarms/alarm_manager.h"
 #include "extensions/browser/api/storage/storage_frontend.h"
@@ -17,10 +20,13 @@ namespace cef {
 void EnsureBrowserContextKeyedServiceFactoriesBuilt() {
   AlarmManager::GetFactoryInstance();
   CookieSettingsFactory::GetInstance();
+  PluginPrefsFactory::GetInstance();
   PrefsTabHelper::GetServiceInstance();
   RendererStartupHelperFactory::GetInstance();
+  SpellcheckServiceFactory::GetInstance();
   StorageFrontend::GetFactoryInstance();
   StreamsPrivateAPI::GetFactoryInstance();
+  ThemeServiceFactory::GetInstance();
 }
 
 }  // namespace cef

libcef/browser/extensions/extension_function_details.cc

@@ -92,7 +92,7 @@ class CefGetExtensionLoadFileCallbackImpl
   static std::unique_ptr<std::string> LoadFileFromStream(
       const std::string& file,
       CefRefPtr<CefStreamReader> stream) {
-    base::ThreadRestrictions::AssertIOAllowed();
+    base::AssertBlockingAllowed();
 
     // Move to the end of the stream.
     stream->Seek(0, SEEK_END);

libcef/browser/extensions/extension_system.cc

@@ -112,7 +112,7 @@ void LoadExtensionWithManifest(base::WeakPtr<CefExtensionSystem> context,
                                bool internal,
                                CefRefPtr<CefRequestContext> loader_context,
                                CefRefPtr<CefExtensionHandler> handler) {
-  base::ThreadRestrictions::AssertIOAllowed();
+  base::AssertBlockingAllowed();
 
   std::unique_ptr<base::DictionaryValue> manifest =
       ParseManifest(manifest_contents);
@@ -131,7 +131,7 @@ void LoadExtensionFromDisk(base::WeakPtr<CefExtensionSystem> context,
                            bool internal,
                            CefRefPtr<CefRequestContext> loader_context,
                            CefRefPtr<CefExtensionHandler> handler) {
-  base::ThreadRestrictions::AssertIOAllowed();
+  base::AssertBlockingAllowed();
 
   base::FilePath manifest_path = root_directory.AppendASCII("manifest.json");
   std::string manifest_contents;

libcef/browser/extensions/extension_web_contents_observer.cc

@@ -36,8 +36,8 @@ void CefExtensionWebContentsObserver::RenderFrameCreated(
   // are allowed to use chrome://resources/ URLs.
   if ((extension->is_extension() || extension->is_platform_app()) &&
       Manifest::IsComponentLocation(extension->location())) {
-    policy->GrantOrigin(process_id,
-                        url::Origin(GURL(content::kChromeUIResourcesURL)));
+    policy->GrantOrigin(
+        process_id, url::Origin::Create(GURL(content::kChromeUIResourcesURL)));
   }
 }
 

libcef/browser/extensions/extensions_browser_client.cc

@@ -124,10 +124,14 @@ CefExtensionsBrowserClient::MaybeCreateResourceBundleRequestJob(
 }
 
 bool CefExtensionsBrowserClient::AllowCrossRendererResourceLoad(
-    net::URLRequest* request,
+    const GURL& url,
+    content::ResourceType resource_type,
+    ui::PageTransition page_transition,
+    int child_id,
     bool is_incognito,
     const Extension* extension,
-    InfoMap* extension_info_map) {
+    const ExtensionSet& extensions,
+    const ProcessMap& process_map) {
   // TODO(cef): This bypasses additional checks added to
   // AllowCrossRendererResourceLoad() in https://crrev.com/5cf9d45c. Figure out
   // why permission is not being granted based on "web_accessible_resources"
@@ -137,7 +141,8 @@ bool CefExtensionsBrowserClient::AllowCrossRendererResourceLoad(
 
   bool allowed = false;
   if (url_request_util::AllowCrossRendererResourceLoad(
-          request, is_incognito, extension, extension_info_map, &allowed)) {
+          url, resource_type, page_transition, child_id, is_incognito,
+          extension, extensions, process_map, &allowed)) {
     return allowed;
   }
 

libcef/browser/extensions/extensions_browser_client.h

@@ -51,10 +51,14 @@ class CefExtensionsBrowserClient : public ExtensionsBrowserClient {
       const base::FilePath& directory_path,
       const std::string& content_security_policy,
       bool send_cors_header) override;
-  bool AllowCrossRendererResourceLoad(net::URLRequest* request,
+  bool AllowCrossRendererResourceLoad(const GURL& url,
+                                      content::ResourceType resource_type,
+                                      ui::PageTransition page_transition,
+                                      int child_id,
                                       bool is_incognito,
                                       const Extension* extension,
-                                      InfoMap* extension_info_map) override;
+                                      const ExtensionSet& extensions,
+                                      const ProcessMap& process_map) override;
   PrefService* GetPrefServiceForContext(
       content::BrowserContext* context) override;
   void GetEarlyExtensionPrefsObservers(

libcef/browser/extensions/value_store/cef_value_store.cc

@@ -10,10 +10,26 @@
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 
+namespace {
+
+const char kGenericErrorMessage[] = "CefValueStore configured to error";
+
+// Having this utility function allows ValueStore::Status to not have a copy
+// constructor.
+ValueStore::Status CreateStatusCopy(const ValueStore::Status& status) {
+  return ValueStore::Status(status.code, status.restore_status, status.message);
+}
+
+}  // namespace
+
 CefValueStore::CefValueStore() : read_count_(0), write_count_(0) {}
 
 CefValueStore::~CefValueStore() {}
 
+void CefValueStore::set_status_code(StatusCode status_code) {
+  status_ = ValueStore::Status(status_code, kGenericErrorMessage);
+}
+
 size_t CefValueStore::GetBytesInUse(const std::string& key) {
   // Let SettingsStorageQuotaEnforcer implement this.
   NOTREACHED();
@@ -39,7 +55,10 @@ ValueStore::ReadResult CefValueStore::Get(const std::string& key) {
 ValueStore::ReadResult CefValueStore::Get(
     const std::vector<std::string>& keys) {
   read_count_++;
-  base::DictionaryValue* settings = new base::DictionaryValue();
+  if (!status_.ok())
+    return ReadResult(CreateStatusCopy(status_));
+
+  auto settings = std::make_unique<base::DictionaryValue>();
   for (std::vector<std::string>::const_iterator it = keys.begin();
        it != keys.end(); ++it) {
     base::Value* value = NULL;
@@ -47,12 +66,14 @@ ValueStore::ReadResult CefValueStore::Get(
       settings->SetWithoutPathExpansion(*it, value->CreateDeepCopy());
     }
   }
-  return MakeReadResult(base::WrapUnique(settings), status_);
+  return ReadResult(std::move(settings), CreateStatusCopy(status_));
 }
 
 ValueStore::ReadResult CefValueStore::Get() {
   read_count_++;
-  return MakeReadResult(storage_.CreateDeepCopy(), status_);
+  if (!status_.ok())
+    return ReadResult(CreateStatusCopy(status_));
+  return ReadResult(storage_.CreateDeepCopy(), CreateStatusCopy(status_));
 }
 
 ValueStore::WriteResult CefValueStore::Set(WriteOptions options,
@@ -67,6 +88,9 @@ ValueStore::WriteResult CefValueStore::Set(
     WriteOptions options,
     const base::DictionaryValue& settings) {
   write_count_++;
+  if (!status_.ok())
+    return WriteResult(CreateStatusCopy(status_));
+
   std::unique_ptr<ValueStoreChangeList> changes(new ValueStoreChangeList());
   for (base::DictionaryValue::Iterator it(settings); !it.IsAtEnd();
        it.Advance()) {
@@ -79,7 +103,7 @@ ValueStore::WriteResult CefValueStore::Set(
       storage_.SetWithoutPathExpansion(it.key(), it.value().CreateDeepCopy());
     }
   }
-  return MakeWriteResult(std::move(changes), status_);
+  return WriteResult(std::move(changes), CreateStatusCopy(status_));
 }
 
 ValueStore::WriteResult CefValueStore::Remove(const std::string& key) {
@@ -89,6 +113,9 @@ ValueStore::WriteResult CefValueStore::Remove(const std::string& key) {
 ValueStore::WriteResult CefValueStore::Remove(
     const std::vector<std::string>& keys) {
   write_count_++;
+  if (!status_.ok())
+    return WriteResult(CreateStatusCopy(status_));
+
   std::unique_ptr<ValueStoreChangeList> changes(new ValueStoreChangeList());
   for (std::vector<std::string>::const_iterator it = keys.begin();
        it != keys.end(); ++it) {
@@ -97,7 +124,7 @@ ValueStore::WriteResult CefValueStore::Remove(
       changes->push_back(ValueStoreChange(*it, std::move(old_value), nullptr));
     }
   }
-  return MakeWriteResult(std::move(changes), status_);
+  return WriteResult(std::move(changes), CreateStatusCopy(status_));
 }
 
 ValueStore::WriteResult CefValueStore::Clear() {
@@ -107,4 +134,4 @@ ValueStore::WriteResult CefValueStore::Clear() {
     keys.push_back(it.key());
   }
   return Remove(keys);
-}
+}

libcef/browser/extensions/value_store/cef_value_store.h

@@ -31,6 +31,10 @@ class CefValueStore : public ValueStore {
   int read_count() const { return read_count_; }
   int write_count() const { return write_count_; }
 
+  // Sets the error code for requests. If OK, errors won't be thrown.
+  // Defaults to OK.
+  void set_status_code(StatusCode status_code);
+
   // ValueStore implementation.
   size_t GetBytesInUse(const std::string& key) override;
   size_t GetBytesInUse(const std::vector<std::string>& keys) override;