Update to Chromium version 111.0.5563.0 (#1097615)

libcef/browser/devtools/devtools_file_manager.cc

@@ -6,17 +6,17 @@
 
 #include "libcef/browser/alloy/alloy_browser_host_impl.h"
 
-#include "base/bind.h"
-#include "base/callback.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
 #include "base/json/json_writer.h"
 #include "base/json/values_util.h"
 #include "base/lazy_instance.h"
 #include "base/path_service.h"
 #include "base/strings/utf_string_conversions.h"
+#include "base/task/sequenced_task_runner.h"
 #include "base/task/thread_pool.h"
-#include "base/threading/sequenced_task_runner_handle.h"
 #include "base/values.h"
 #include "chrome/common/pref_names.h"
 #include "components/prefs/scoped_user_pref_update.h"
@@ -142,9 +142,8 @@ void CefDevToolsFileManager::SaveAsFileSelected(const std::string& url,
   *g_last_save_path.Pointer() = path;
   saved_files_[url] = path;
 
-  DictionaryPrefUpdate update(prefs_, prefs::kDevToolsEditedFiles);
-  base::Value* files_map = update.Get();
-  files_map->SetKey(base::MD5String(url), base::FilePathToValue(path));
+  ScopedDictPrefUpdate update(prefs_, prefs::kDevToolsEditedFiles);
+  update->Set(base::MD5String(url), base::FilePathToValue(path));
   std::string file_system_path = path.AsUTF8Unsafe();
   std::move(callback).Run(file_system_path);
   file_task_runner_->PostTask(FROM_HERE,

libcef/browser/devtools/devtools_file_manager.h

@@ -5,7 +5,7 @@
 #ifndef CEF_LIBCEF_BROWSER_DEVTOOLS_DEVTOOLS_FILE_MANAGER_H_
 #define CEF_LIBCEF_BROWSER_DEVTOOLS_DEVTOOLS_FILE_MANAGER_H_
 
-#include "base/callback_forward.h"
+#include "base/functional/callback_forward.h"
 #include "base/memory/weak_ptr.h"
 
 #include <map>

libcef/browser/devtools/devtools_frontend.cc

@@ -222,7 +222,7 @@ class CefDevToolsFrontend::NetworkResourceLoader
   void OnComplete(bool success) override {
     auto response = BuildObjectForResponse(response_headers_.get(), success,
                                            loader_->NetError());
-    bindings_->SendMessageAck(request_id_, base::Value(std::move(response)));
+    bindings_->SendMessageAck(request_id_, std::move(response));
 
     bindings_->loaders_.erase(bindings_->loaders_.find(this));
   }
@@ -424,7 +424,7 @@ void CefDevToolsFrontend::HandleMessageFromDevToolsFrontend(
       base::Value::Dict response;
       response.Set("statusCode", 404);
       response.Set("urlValid", false);
-      SendMessageAck(request_id, base::Value(std::move(response)));
+      SendMessageAck(request_id, std::move(response));
       return;
     }
 
@@ -475,7 +475,7 @@ void CefDevToolsFrontend::HandleMessageFromDevToolsFrontend(
     } else if (content::HasWebUIScheme(gurl)) {
       base::Value::Dict response;
       response.Set("statusCode", 403);
-      SendMessageAck(request_id, base::Value(std::move(response)));
+      SendMessageAck(request_id, std::move(response));
       return;
     } else {
       auto* partition =
@@ -491,9 +491,8 @@ void CefDevToolsFrontend::HandleMessageFromDevToolsFrontend(
     loaders_.insert(std::move(resource_loader));
     return;
   } else if (*method == "getPreferences") {
-    SendMessageAck(
-        request_id,
-        base::Value(GetPrefs()->GetDict(prefs::kDevToolsPreferences).Clone()));
+    SendMessageAck(request_id,
+                   GetPrefs()->GetDict(prefs::kDevToolsPreferences).Clone());
     return;
   } else if (*method == "setPreference") {
     if (params.size() < 2) {
@@ -507,15 +506,15 @@ void CefDevToolsFrontend::HandleMessageFromDevToolsFrontend(
       return;
     }
 
-    DictionaryPrefUpdate update(GetPrefs(), prefs::kDevToolsPreferences);
-    update.Get()->SetKey(*name, std::move(params[1]));
+    ScopedDictPrefUpdate update(GetPrefs(), prefs::kDevToolsPreferences);
+    update->Set(*name, std::move(params[1]));
   } else if (*method == "removePreference") {
     const std::string* name = params[0].GetIfString();
     if (!name) {
       return;
     }
-    DictionaryPrefUpdate update(GetPrefs(), prefs::kDevToolsPreferences);
-    update.Get()->RemoveKey(*name);
+    ScopedDictPrefUpdate update(GetPrefs(), prefs::kDevToolsPreferences);
+    update->Remove(*name);
   } else if (*method == "requestFileSystems") {
     web_contents()->GetPrimaryMainFrame()->ExecuteJavaScriptForTests(
         u"DevToolsAPI.fileSystemsLoaded([]);", base::NullCallback());
@@ -561,7 +560,7 @@ void CefDevToolsFrontend::HandleMessageFromDevToolsFrontend(
   }
 
   if (request_id) {
-    SendMessageAck(request_id, base::Value());
+    SendMessageAck(request_id, base::Value::Dict());
   }
 }
 
@@ -628,9 +627,10 @@ void CefDevToolsFrontend::CallClientFunction(
       std::move(arguments), std::move(cb));
 }
 
-void CefDevToolsFrontend::SendMessageAck(int request_id, base::Value arg) {
+void CefDevToolsFrontend::SendMessageAck(int request_id,
+                                         base::Value::Dict arg) {
   CallClientFunction("DevToolsAPI", "embedderMessageAck",
-                     base::Value(request_id), std::move(arg));
+                     base::Value(request_id), base::Value(std::move(arg)));
 }
 
 bool CefDevToolsFrontend::ProtocolLoggingEnabled() const {

libcef/browser/devtools/devtools_frontend.h

@@ -83,7 +83,7 @@ class CefDevToolsFrontend : public content::WebContentsObserver,
   void PrimaryMainDocumentElementAvailable() override;
   void WebContentsDestroyed() override;
 
-  void SendMessageAck(int request_id, base::Value arg);
+  void SendMessageAck(int request_id, base::Value::Dict arg);
 
   bool ProtocolLoggingEnabled() const;
   void LogProtocolMessage(ProtocolMessageType type,

libcef/browser/devtools/devtools_manager_delegate.cc

@@ -9,9 +9,9 @@
 #include <vector>
 
 #include "base/atomicops.h"
-#include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
+#include "base/functional/bind.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
@@ -128,7 +128,7 @@ CefDevToolsManagerDelegate::CefDevToolsManagerDelegate() {}
 CefDevToolsManagerDelegate::~CefDevToolsManagerDelegate() {}
 
 scoped_refptr<content::DevToolsAgentHost>
-CefDevToolsManagerDelegate::CreateNewTarget(const GURL& url) {
+CefDevToolsManagerDelegate::CreateNewTarget(const GURL& url, bool for_tab) {
   // This is reached when the user selects "Open link in new tab" from the
   // DevTools interface.
   // TODO(cef): Consider exposing new API to support this.

libcef/browser/devtools/devtools_manager_delegate.h

@@ -26,7 +26,8 @@ class CefDevToolsManagerDelegate : public content::DevToolsManagerDelegate {
 
   // DevToolsManagerDelegate implementation.
   scoped_refptr<content::DevToolsAgentHost> CreateNewTarget(
-      const GURL& url) override;
+      const GURL& url,
+      bool for_tab) override;
   std::string GetDiscoveryPageHTML() override;
   bool HasBundledFrontendResources() override;
 };