BASELINE: Update Chromium to 85.0.4183.14085-based

Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

9 files changed, 23 insertions, 64 deletions

diff --git a/chromium/components/bookmarks/browser/BUILD.gn b/chromium/components/bookmarks/browser/BUILD.gn
index 435129bfb41..5a6753918c7 100644
--- a/chromium/components/bookmarks/browser/BUILD.gn
+++ b/chromium/components/bookmarks/browser/BUILD.gn
@@ -102,7 +102,10 @@ static_library("test_support") {
     "bookmark_test_util.h",
   ]
 
-  deps = [ ":browser" ]
+  deps = [
+    ":browser",
+    "//base",
+  ]
 }
 
 bundle_data("unit_tests_bundle_data") {
diff --git a/chromium/components/bookmarks/browser/bookmark_model.h b/chromium/components/bookmarks/browser/bookmark_model.h
index ed953cc352e..a961929b106 100644
--- a/chromium/components/bookmarks/browser/bookmark_model.h
+++ b/chromium/components/bookmarks/browser/bookmark_model.h
@@ -13,8 +13,8 @@
 #include <set>
 #include <vector>
 
+#include "base/check_op.h"
 #include "base/compiler_specific.h"
-#include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/scoped_refptr.h"
 #include "base/memory/weak_ptr.h"
diff --git a/chromium/components/bookmarks/browser/bookmark_node_data.cc b/chromium/components/bookmarks/browser/bookmark_node_data.cc
index 583abdad68e..91cd83f01c9 100644
--- a/chromium/components/bookmarks/browser/bookmark_node_data.cc
+++ b/chromium/components/bookmarks/browser/bookmark_node_data.cc
@@ -7,6 +7,7 @@
 #include <algorithm>
 #include <string>
 
+#include "base/logging.h"
 #include "base/numerics/safe_conversions.h"
 #include "base/pickle.h"
 #include "base/strings/utf_string_conversions.h"
diff --git a/chromium/components/bookmarks/browser/bookmark_node_data_read_fuzzer.cc b/chromium/components/bookmarks/browser/bookmark_node_data_read_fuzzer.cc
index 5f8439b0c4d..bcb57d5256a 100644
--- a/chromium/components/bookmarks/browser/bookmark_node_data_read_fuzzer.cc
+++ b/chromium/components/bookmarks/browser/bookmark_node_data_read_fuzzer.cc
@@ -8,6 +8,7 @@
 #include "base/at_exit.h"
 #include "base/containers/span.h"
 #include "base/i18n/icu_util.h"
+#include "base/logging.h"
 #include "base/pickle.h"
 #include "components/bookmarks/browser/bookmark_node_data.h"
 
diff --git a/chromium/components/bookmarks/browser/bookmark_node_data_unittest.cc b/chromium/components/bookmarks/browser/bookmark_node_data_unittest.cc
index 720b557622e..b68b67b170a 100644
--- a/chromium/components/bookmarks/browser/bookmark_node_data_unittest.cc
+++ b/chromium/components/bookmarks/browser/bookmark_node_data_unittest.cc
@@ -145,8 +145,8 @@ TEST_F(BookmarkNodeDataTest, URL) {
   // Writing should also put the URL and title on the clipboard.
   GURL read_url;
   base::string16 read_title;
-  EXPECT_TRUE(
-      data2.GetURLAndTitle(ui::CONVERT_FILENAMES, &read_url, &read_title));
+  EXPECT_TRUE(data2.GetURLAndTitle(ui::FilenameToURLPolicy::CONVERT_FILENAMES,
+                                   &read_url, &read_title));
   EXPECT_EQ(url, read_url);
   EXPECT_EQ(title, read_title);
 }
diff --git a/chromium/components/bookmarks/browser/bookmark_node_data_views.cc b/chromium/components/bookmarks/browser/bookmark_node_data_views.cc
index 658ad5c8d17..b8faf0bbd11 100644
--- a/chromium/components/bookmarks/browser/bookmark_node_data_views.cc
+++ b/chromium/components/bookmarks/browser/bookmark_node_data_views.cc
@@ -59,7 +59,8 @@ bool BookmarkNodeData::Read(const ui::OSExchangeData& data) {
     // See if there is a URL on the clipboard.
     GURL url;
     base::string16 title;
-    if (data.GetURLAndTitle(ui::CONVERT_FILENAMES, &url, &title))
+    if (data.GetURLAndTitle(ui::FilenameToURLPolicy::CONVERT_FILENAMES, &url,
+                            &title))
       ReadFromTuple(url, title);
   }
 
diff --git a/chromium/components/bookmarks/browser/bookmark_storage.cc b/chromium/components/bookmarks/browser/bookmark_storage.cc
index a6ac086d45c..76f46a536a6 100644
--- a/chromium/components/bookmarks/browser/bookmark_storage.cc
+++ b/chromium/components/bookmarks/browser/bookmark_storage.cc
@@ -93,22 +93,6 @@ int GetNumDuplicateUrls(const BookmarkNode* root) {
   return num_duplicate_urls;
 }
 
-// Computes the number of bookmarks with an empty title. This includes folders
-// too except for the root.
-int GetNumNodesWithEmptyTitle(const BookmarkNode* node) {
-  DCHECK(node);
-
-  int num_nodes_with_empty_title = 0;
-
-  if (!node->is_root() && node->GetTitle().empty())
-    ++num_nodes_with_empty_title;
-
-  for (const auto& child : node->children())
-    num_nodes_with_empty_title += GetNumNodesWithEmptyTitle(child.get());
-
-  return num_nodes_with_empty_title;
-}
-
 }  // namespace
 
 void LoadBookmarks(const base::FilePath& path,
@@ -143,15 +127,6 @@ void LoadBookmarks(const base::FilePath& path,
       details->set_model_meta_info_map(codec.model_meta_info_map());
       UMA_HISTOGRAM_TIMES("Bookmarks.DecodeTime",
                           TimeTicks::Now() - start_time);
-      int64_t size = 0;
-      if (base::GetFileSize(path, &size)) {
-        int64_t size_kb = size / 1024;
-        // For 0 bookmarks, file size is 700 bytes (less than 1KB)
-        // Bookmarks file size is not expected to exceed 50000KB (50MB) for most
-        // of the users.
-        UMA_HISTOGRAM_CUSTOM_COUNTS("Bookmarks.FileSize", size_kb, 1, 50000,
-                                    25);
-      }
 
       load_index = true;
     }
@@ -184,13 +159,6 @@ void LoadBookmarks(const base::FilePath& path,
           "Bookmarks.Count.OnProfileLoad.DuplicateUrl", num_duplicate_urls);
     }
 
-    int num_nodes_with_empty_title =
-        GetNumNodesWithEmptyTitle(details->root_node());
-    if (num_nodes_with_empty_title > 0) {
-      base::UmaHistogramCounts10000("Bookmarks.Count.OnProfileLoad.EmptyTitle",
-                                    num_nodes_with_empty_title);
-    }
-
     UMA_HISTOGRAM_TIMES("Bookmarks.DuplicateAndEmptyTitleDetectionTime",
                         TimeTicks::Now() - start_time);
   }
diff --git a/chromium/components/bookmarks/browser/bookmark_test_util.cc b/chromium/components/bookmarks/browser/bookmark_test_util.cc
index 34b9aee1446..f129d63df42 100644
--- a/chromium/components/bookmarks/browser/bookmark_test_util.cc
+++ b/chromium/components/bookmarks/browser/bookmark_test_util.cc
@@ -6,6 +6,7 @@
 
 #include <iostream>
 
+#include "base/logging.h"
 #include "components/bookmarks/browser/bookmark_node.h"
 
 namespace bookmarks {
diff --git a/chromium/components/bookmarks/managed/BUILD.gn b/chromium/components/bookmarks/managed/BUILD.gn
index 28508418bbf..2798dc35a13 100644
--- a/chromium/components/bookmarks/managed/BUILD.gn
+++ b/chromium/components/bookmarks/managed/BUILD.gn
@@ -8,44 +8,33 @@ static_library("managed") {
     "managed_bookmark_service.h",
     "managed_bookmark_util.cc",
     "managed_bookmark_util.h",
+    "managed_bookmarks_policy_handler.cc",
+    "managed_bookmarks_policy_handler.h",
     "managed_bookmarks_tracker.cc",
     "managed_bookmarks_tracker.h",
   ]
 
-  if (!is_ios) {
-    sources += [
-      "managed_bookmarks_policy_handler.cc",
-      "managed_bookmarks_policy_handler.h",
-    ]
-  }
-
   deps = [
     "//base",
     "//components/bookmarks/browser",
     "//components/bookmarks/common",
     "//components/keyed_service/core",
+    "//components/policy/core/browser",
+    "//components/policy/core/common",
     "//components/prefs",
     "//components/strings",
+    "//components/url_formatter",
     "//ui/base",
     "//url",
   ]
-
-  if (!is_ios) {
-    deps += [
-      "//components/policy/core/browser",
-      "//components/policy/core/common",
-      "//components/url_formatter",
-    ]
-  }
 }
 
 source_set("unit_tests") {
   testonly = true
-  sources = [ "managed_bookmarks_tracker_unittest.cc" ]
-
-  if (!is_ios) {
-    sources += [ "managed_bookmarks_policy_handler_unittest.cc" ]
-  }
+  sources = [
+    "managed_bookmarks_policy_handler_unittest.cc",
+    "managed_bookmarks_tracker_unittest.cc",
+  ]
 
   configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
 
@@ -56,6 +45,8 @@ source_set("unit_tests") {
     "//components/bookmarks/browser",
     "//components/bookmarks/common",
     "//components/bookmarks/test",
+    "//components/policy/core/browser:test_support",
+    "//components/policy/core/common",
     "//components/prefs:test_support",
     "//components/strings",
     "//testing/gmock",
@@ -63,11 +54,4 @@ source_set("unit_tests") {
     "//ui/base",
     "//url",
   ]
-
-  if (!is_ios) {
-    deps += [
-      "//components/policy/core/browser:test_support",
-      "//components/policy/core/common",
-    ]
-  }
 }