Update to Chromium version 111.0.5563.0 (#1097615)

libcef/common/alloy/alloy_content_client.cc

@@ -47,9 +47,10 @@ namespace {
 // The following plugin-related methods are from
 // chrome/common/chrome_content_client.cc
 
-const char kPDFPluginExtension[] = "pdf";
-const char kPDFPluginDescription[] = "Portable Document Format";
-const uint32_t kPDFPluginPermissions =
+constexpr char kPDFPluginName[] = "Chromium PDF Plugin";
+constexpr char kPDFPluginExtension[] = "pdf";
+constexpr char kPDFPluginDescription[] = "Portable Document Format";
+constexpr uint32_t kPDFPluginPermissions =
     ppapi::PERMISSION_PDF | ppapi::PERMISSION_DEV;
 
 // Appends the known built-in plugins to the given vector. Some built-in
@@ -62,9 +63,9 @@ void ComputeBuiltInPlugins(std::vector<content::ContentPluginInfo>* plugins) {
     content::ContentPluginInfo pdf_info;
     pdf_info.is_internal = true;
     pdf_info.is_out_of_process = true;
-    pdf_info.name = ChromeContentClient::kPDFInternalPluginName;
+    pdf_info.name = kPDFPluginName;
     pdf_info.description = kPDFPluginDescription;
-    pdf_info.path = base::FilePath(ChromeContentClient::kPDFPluginPath);
+    pdf_info.path = base::FilePath(ChromeContentClient::kPDFInternalPluginPath);
     content::WebPluginMimeType pdf_mime_type(pdf::kInternalPluginMimeType,
                                              kPDFPluginExtension,
                                              kPDFPluginDescription);

libcef/common/app_manager.h

@@ -11,7 +11,7 @@
 #include "include/cef_app.h"
 #include "include/cef_request_context.h"
 
-#include "base/callback.h"
+#include "base/functional/callback.h"
 #include "build/build_config.h"
 #include "content/public/common/content_client.h"
 

libcef/common/extensions/api/README.txt

@@ -22,7 +22,7 @@ To add a new extension API implemented only in CEF ***:
    files if necessary [2].
 7. Call `<class>::GetInstance();` or `<class>Factory::GetFactoryInstance();` [3]
    from EnsureBrowserContextKeyedServiceFactoriesBuilt in
-   libcef/browser/extensions/browser_context_keyed_service_factories.cc.
+   libcef/browser/browser_context_keyed_service_factories.cc.
 8. Call `DependsOn(<class>Factory::GetInstance());` from
    CefExtensionSystemFactory::CefExtensionSystemFactory in
    libcef/browser/extensions/extension_system_factory.cc if necessary [3].

libcef/common/extensions/api/_api_features.json

@@ -22,6 +22,10 @@
     "channel": "stable",
     "matches": ["<all_urls>"]
   },
+  "pdfViewerPrivate": {
+    "dependencies": ["permission:pdfViewerPrivate"],
+    "contexts": ["blessed_extension"]
+  },
   "resourcesPrivate": [
     {
       "dependencies": ["permission:resourcesPrivate"],

libcef/common/extensions/api/_permission_features.json

@@ -16,6 +16,13 @@
     "channel": "stable",
     "extension_types": ["extension", "legacy_packaged_app"]
   },
+  "pdfViewerPrivate": {
+    "channel": "stable",
+    "extension_types": ["extension"],
+    "allowlist": [
+      "CBCC42ABED43A4B58FE3810E62AFFA010EB0349F"  // PDF Viewer
+    ]
+  },
   "resourcesPrivate": {
     "channel": "stable",
     "extension_types": [

libcef/common/frame_util.h

@@ -9,8 +9,8 @@
 #include <string>
 
 #include "base/logging.h"
+#include "content/public/browser/child_process_host.h"
 #include "content/public/browser/global_routing_id.h"
-#include "content/public/common/child_process_host.h"
 
 namespace content {
 class NavigationHandle;

libcef/common/scheme_registrar_impl.cc

@@ -10,7 +10,7 @@
 #include "libcef/common/net/scheme_info.h"
 #include "libcef/common/net/scheme_registration.h"
 
-#include "base/bind.h"
+#include "base/functional/bind.h"
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 

libcef/common/string_util.h

@@ -8,7 +8,7 @@
 
 #include "include/cef_base.h"
 
-#include "base/callback.h"
+#include "base/functional/callback.h"
 #include "base/memory/scoped_refptr.h"
 
 namespace base {

libcef/common/task_impl.cc

@@ -5,7 +5,7 @@
 #include "include/cef_task.h"
 #include "libcef/common/task_runner_impl.h"
 
-#include "base/bind.h"
+#include "base/functional/bind.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/time/time.h"

libcef/common/task_runner_impl.cc

@@ -6,11 +6,11 @@
 
 #include "libcef/common/task_runner_manager.h"
 
-#include "base/bind.h"
+#include "base/functional/bind.h"
 #include "base/location.h"
 #include "base/logging.h"
+#include "base/task/single_thread_task_runner.h"
 #include "base/task/thread_pool.h"
-#include "base/threading/thread_task_runner_handle.h"
 #include "base/time/time.h"
 #include "content/public/browser/browser_task_traits.h"
 #include "content/public/browser/browser_thread.h"
@@ -110,7 +110,7 @@ CefTaskRunnerImpl::GetCurrentTaskRunner() {
 
   // Check for a MessageLoopProxy. This covers all of the named browser and
   // render process threads, plus a few extra.
-  if (auto task_runner = base::ThreadTaskRunnerHandle::Get()) {
+  if (auto task_runner = base::SingleThreadTaskRunner::GetCurrentDefault()) {
     return task_runner;
   }
 

libcef/common/thread_impl.cc

@@ -6,7 +6,7 @@
 
 #include "libcef/common/task_runner_impl.h"
 
-#include "base/bind.h"
+#include "base/functional/bind.h"
 #include "base/threading/thread_restrictions.h"
 
 namespace {