diff options
Diffstat (limited to 'chromium/components/bookmarks/browser')
8 files changed, 12 insertions, 37 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 { |