Merge //components/browsing_data_ui into //components/browsing_data/core

The component browsing_data_ui contains code used by the Clear Browsing
Data dialog on all platforms. It was created because there was no other
component fitting that purpose.

However, the browsing_data component has been recently made into a layered
component (https://codereview.chromium.org/2127403002), providing various
browsing data related functionality for all platforms.

Since the two components have basically the same purpose and confusingly
similar names, we merge them into one.

TBR=dbeam@chromium.org
BUG=635873

Review-Url: https://codereview.chromium.org/2238453002
Cr-Commit-Position: refs/heads/master@{#419450}

chrome/browser/android/preferences/pref_service_bridge.cc

@@ -43,8 +43,8 @@
 #include "chrome/grit/locale_settings.h"
 #include "components/browser_sync/profile_sync_service.h"
 #include "components/browsing_data/core/browsing_data_utils.h"
+#include "components/browsing_data/core/history_notice_utils.h"
 #include "components/browsing_data/core/pref_names.h"
-#include "components/browsing_data_ui/history_notice_utils.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "components/content_settings/core/common/content_settings.h"
 #include "components/content_settings/core/common/content_settings_pattern.h"
@@ -771,14 +771,14 @@ static void RequestInfoAboutOtherFormsOfBrowsingHistory(
     const JavaParamRef<jobject>& obj,
     const JavaParamRef<jobject>& listener) {
   // The permanent notice in the footer.
-  browsing_data_ui::ShouldShowNoticeAboutOtherFormsOfBrowsingHistory(
+  browsing_data::ShouldShowNoticeAboutOtherFormsOfBrowsingHistory(
       ProfileSyncServiceFactory::GetForProfile(GetOriginalProfile()),
       WebHistoryServiceFactory::GetForProfile(GetOriginalProfile()),
       base::Bind(&ShowNoticeAboutOtherFormsOfBrowsingHistory,
                  base::Owned(new ScopedJavaGlobalRef<jobject>(env, listener))));
 
   // The one-time notice in the dialog.
-  browsing_data_ui::ShouldPopupDialogAboutOtherFormsOfBrowsingHistory(
+  browsing_data::ShouldPopupDialogAboutOtherFormsOfBrowsingHistory(
       ProfileSyncServiceFactory::GetForProfile(GetOriginalProfile()),
       WebHistoryServiceFactory::GetForProfile(GetOriginalProfile()),
       chrome::GetChannel(),

chrome/browser/ui/BUILD.gn

@@ -469,7 +469,6 @@ split_static_library("ui") {
     "//components/bookmarks/managed",
     "//components/browser_sync",
     "//components/browsing_data/core",
-    "//components/browsing_data_ui",
     "//components/bubble:bubble",
     "//components/certificate_reporting:cert_logger_proto",
     "//components/certificate_reporting:encrypted_cert_logger_proto",

chrome/browser/ui/webui/browsing_history_handler.cc

@@ -39,7 +39,7 @@
 #include "components/bookmarks/browser/bookmark_model.h"
 #include "components/bookmarks/browser/bookmark_utils.h"
 #include "components/browser_sync/profile_sync_service.h"
-#include "components/browsing_data_ui/history_notice_utils.h"
+#include "components/browsing_data/core/history_notice_utils.h"
 #include "components/favicon/core/fallback_icon_service.h"
 #include "components/favicon/core/fallback_url_util.h"
 #include "components/favicon/core/large_icon_service.h"
@@ -472,7 +472,7 @@ void BrowsingHistoryHandler::QueryHistory(
         this, &BrowsingHistoryHandler::WebHistoryTimeout);
 
     // Test the existence of other forms of browsing history.
-    browsing_data_ui::ShouldShowNoticeAboutOtherFormsOfBrowsingHistory(
+    browsing_data::ShouldShowNoticeAboutOtherFormsOfBrowsingHistory(
         ProfileSyncServiceFactory::GetInstance()->GetForProfile(profile),
         web_history,
         base::Bind(

chrome/browser/ui/webui/history_ui.cc

@@ -22,8 +22,8 @@
 #include "chrome/grit/browser_resources.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/grit/theme_resources.h"
+#include "components/browsing_data/core/history_notice_utils.h"
 #include "components/browsing_data/core/pref_names.h"
-#include "components/browsing_data_ui/history_notice_utils.h"
 #include "components/grit/components_scaled_resources.h"
 #include "components/prefs/pref_service.h"
 #include "components/search/search.h"
@@ -194,7 +194,7 @@ HistoryUI::HistoryUI(content::WebUI* web_ui) : WebUIController(web_ui) {
   if (url.has_query() && url.query() == "reset_ofbh") {
     Profile::FromWebUI(web_ui)->GetPrefs()->SetInteger(
         browsing_data::prefs::kClearBrowsingDataHistoryNoticeShownTimes, 0);
-    browsing_data_ui::testing::
+    browsing_data::testing::
         g_override_other_forms_of_browsing_history_query = true;
   }
 

chrome/browser/ui/webui/options/clear_browser_data_handler.cc

@@ -36,8 +36,8 @@
 #include "chrome/grit/generated_resources.h"
 #include "chrome/grit/locale_settings.h"
 #include "components/browsing_data/core/counters/browsing_data_counter.h"
+#include "components/browsing_data/core/history_notice_utils.h"
 #include "components/browsing_data/core/pref_names.h"
-#include "components/browsing_data_ui/history_notice_utils.h"
 #include "components/google/core/browser/google_util.h"
 #include "components/prefs/pref_service.h"
 #include "content/public/browser/notification_details.h"
@@ -396,7 +396,7 @@ void ClearBrowserDataHandler::OnStateChanged() {
 }
 
 void ClearBrowserDataHandler::RefreshHistoryNotice() {
-  browsing_data_ui::ShouldShowNoticeAboutOtherFormsOfBrowsingHistory(
+  browsing_data::ShouldShowNoticeAboutOtherFormsOfBrowsingHistory(
       sync_service_,
       WebHistoryServiceFactory::GetForProfile(Profile::FromWebUI(web_ui())),
       base::Bind(&ClearBrowserDataHandler::UpdateHistoryNotice,
@@ -409,7 +409,7 @@ void ClearBrowserDataHandler::RefreshHistoryNotice() {
       browsing_data::prefs::kClearBrowsingDataHistoryNoticeShownTimes);
 
   if (notice_shown_times < kMaxTimesHistoryNoticeShown) {
-    browsing_data_ui::ShouldPopupDialogAboutOtherFormsOfBrowsingHistory(
+    browsing_data::ShouldPopupDialogAboutOtherFormsOfBrowsingHistory(
         sync_service_,
         WebHistoryServiceFactory::GetForProfile(Profile::FromWebUI(web_ui())),
         chrome::GetChannel(),

chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.cc

@@ -18,8 +18,8 @@
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/common/channel_info.h"
 #include "chrome/common/pref_names.h"
+#include "components/browsing_data/core/history_notice_utils.h"
 #include "components/browsing_data/core/pref_names.h"
-#include "components/browsing_data_ui/history_notice_utils.h"
 #include "components/prefs/pref_service.h"
 #include "content/public/browser/web_ui.h"
 
@@ -284,7 +284,7 @@ void ClearBrowsingDataHandler::OnStateChanged() {
 }
 
 void ClearBrowsingDataHandler::RefreshHistoryNotice() {
-  browsing_data_ui::ShouldShowNoticeAboutOtherFormsOfBrowsingHistory(
+  browsing_data::ShouldShowNoticeAboutOtherFormsOfBrowsingHistory(
       sync_service_,
       WebHistoryServiceFactory::GetForProfile(profile_),
       base::Bind(&ClearBrowsingDataHandler::UpdateHistoryNotice,
@@ -297,7 +297,7 @@ void ClearBrowsingDataHandler::RefreshHistoryNotice() {
       browsing_data::prefs::kClearBrowsingDataHistoryNoticeShownTimes);
 
   if (notice_shown_times < kMaxTimesHistoryNoticeShown) {
-    browsing_data_ui::ShouldPopupDialogAboutOtherFormsOfBrowsingHistory(
+    browsing_data::ShouldPopupDialogAboutOtherFormsOfBrowsingHistory(
         sync_service_,
         WebHistoryServiceFactory::GetForProfile(profile_),
         chrome::GetChannel(),

components/BUILD.gn

@@ -65,7 +65,6 @@ test("components_unittests") {
     "//components/bookmarks/managed:unit_tests",
     "//components/browser_sync:unit_tests",
     "//components/browsing_data/core:unit_tests",
-    "//components/browsing_data_ui:unit_tests",
     "//components/bubble:unit_tests",
     "//components/captive_portal:unit_tests",
     "//components/client_update_protocol:unit_tests",

components/browsing_data/core/BUILD.gn

@@ -18,6 +18,8 @@ static_library("core") {
     "counters/history_counter.h",
     "counters/passwords_counter.cc",
     "counters/passwords_counter.h",
+    "history_notice_utils.cc",
+    "history_notice_utils.h",
     "pref_names.cc",
     "pref_names.h",
   ]
@@ -31,6 +33,7 @@ static_library("core") {
     "//components/prefs:prefs",
     "//components/strings",
     "//components/sync",
+    "//components/version_info",
     "//components/webdata/common",
     "//ui/base",
   ]
@@ -49,12 +52,19 @@ source_set("unit_tests") {
   testonly = true
   sources = [
     "browsing_data_utils_unittest.cc",
+    "history_notice_utils_unittest.cc",
   ]
 
   deps = [
     ":core",
     "//base",
     "//components/autofill/core/browser:browser",
+    "//components/history/core/test:test",
+    "//components/signin/core/browser:test_support",
+    "//components/sync:test_support_sync_driver",
+    "//components/sync/protocol:protocol",
+    "//components/version_info:version_info",
+    "//net",
     "//testing/gtest",
   ]
 }

components/browsing_data/core/DEPS

 include_rules = [
   "+components/autofill/core/browser",
+  "+components/browser_sync",
   "+components/history/core/browser",
+  "+components/history/core/test",
   "+components/password_manager/core/browser",
   "+components/pref_registry",
   "+components/prefs",
+  "+components/signin",
+  "+components/sync/base",
+  "+components/sync/core",
   "+components/sync/driver",
+  "+components/version_info",
   "+components/webdata/common",
   "+grit",
+  "+net",
   "+ui/base",
 ]

components/browsing_data/core/OWNERS

+per-file history_notice_utils*=msarda@chromium.org

components/browsing_data_ui/history_notice_utils.cc → components/browsing_data/core/history_notice_utils.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/browsing_data_ui/history_notice_utils.h"
+#include "components/browsing_data/core/history_notice_utils.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ -51,7 +51,7 @@ class MergeBooleanCallbacks {
 
 }  // namespace
 
-namespace browsing_data_ui {
+namespace browsing_data {
 
 namespace testing {
 
@@ -112,4 +112,4 @@ void ShouldPopupDialogAboutOtherFormsOfBrowsingHistory(
           &MergeBooleanCallbacks::RunCallback, base::Unretained(merger)));
 }
 
-}  // namespace browsing_data_ui
+}  // namespace browsing_data

components/browsing_data_ui/history_notice_utils.h → components/browsing_data/core/history_notice_utils.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_BROWSING_DATA_UI_HISTORY_NOTICE_UTILS_H_
-#define COMPONENTS_BROWSING_DATA_UI_HISTORY_NOTICE_UTILS_H_
+#ifndef COMPONENTS_BROWSING_DATA_CORE_HISTORY_NOTICE_UTILS_H_
+#define COMPONENTS_BROWSING_DATA_CORE_HISTORY_NOTICE_UTILS_H_
 
 #include <string>
 
@@ -21,7 +21,7 @@ namespace version_info {
 enum class Channel;
 }
 
-namespace browsing_data_ui {
+namespace browsing_data {
 
 namespace testing {
 
@@ -53,6 +53,6 @@ void ShouldPopupDialogAboutOtherFormsOfBrowsingHistory(
     version_info::Channel channel,
     base::Callback<void(bool)> callback);
 
-}  // namespace browsing_data_ui
+}  // namespace browsing_data
 
-#endif  // COMPONENTS_BROWSING_DATA_UI_HISTORY_NOTICE_UTILS_H_
+#endif  // COMPONENTS_BROWSING_DATA_CORE_HISTORY_NOTICE_UTILS_H_

components/browsing_data_ui/history_notice_utils_unittest.cc → components/browsing_data/core/history_notice_utils_unittest.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/browsing_data_ui/history_notice_utils.h"
+#include "components/browsing_data/core/history_notice_utils.h"
 
 #include <memory>
 
@@ -21,7 +21,7 @@
 #include "net/url_request/url_request_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-namespace browsing_data_ui {
+namespace browsing_data {
 
 namespace {
 
@@ -184,4 +184,4 @@ TEST_F(HistoryNoticeUtilsTest, WebHistoryStates) {
   ExpectShouldPopupDialogAboutOtherFormsOfBrowsingHistoryWithResult(false);
 }
 
-}  // namespace browsing_data_ui
+}  // namespace browsing_data

components/browsing_data_ui/BUILD.gn

-# Copyright 2016 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-static_library("browsing_data_ui") {
-  sources = [
-    "history_notice_utils.cc",
-    "history_notice_utils.h",
-  ]
-
-  deps = [
-    "//base",
-    "//components/history/core/browser",
-    "//components/sync",
-    "//components/version_info",
-  ]
-}
-
-source_set("unit_tests") {
-  testonly = true
-  sources = [
-    "history_notice_utils_unittest.cc",
-  ]
-
-  deps = [
-    ":browsing_data_ui",
-    "//base",
-    "//components/history/core/test:test",
-    "//components/signin/core/browser:test_support",
-    "//components/sync:test_support_sync_driver",
-    "//components/sync/protocol:protocol",
-    "//components/version_info:version_info",
-    "//net",
-    "//testing/gtest",
-  ]
-}

components/browsing_data_ui/OWNERS

-msarda@chromium.org
-msramek@chromium.org

ios/chrome/browser/BUILD.gn

@@ -617,7 +617,6 @@ source_set("browser") {
     "//components/bookmarks/browser",
     "//components/browser_sync",
     "//components/browsing_data/core",
-    "//components/browsing_data_ui",
     "//components/component_updater",
     "//components/content_settings/core/browser",
     "//components/content_settings/core/common",

ios/chrome/browser/DEPS

@@ -8,7 +8,6 @@ include_rules = [
   "+components/bookmarks",
   "+components/browser_sync",
   "+components/browsing_data/core",
-  "+components/browsing_data_ui",
   "+components/component_updater",
   "+components/content_settings/core",
   "+components/cookie_config",

ios/chrome/browser/ui/webui/history/browsing_history_handler.cc

@@ -21,7 +21,7 @@
 #include "components/bookmarks/browser/bookmark_model.h"
 #include "components/bookmarks/browser/bookmark_utils.h"
 #include "components/browser_sync/profile_sync_service.h"
-#include "components/browsing_data_ui/history_notice_utils.h"
+#include "components/browsing_data/core/history_notice_utils.h"
 #include "components/history/core/browser/history_service.h"
 #include "components/history/core/browser/history_types.h"
 #include "components/history/core/browser/top_sites.h"
@@ -374,7 +374,7 @@ void BrowsingHistoryHandler::QueryHistory(
         IOSChromeProfileSyncServiceFactory::GetInstance()->GetForBrowserState(
             browser_state);
     // Test the existence of other forms of browsing history.
-    browsing_data_ui::ShouldShowNoticeAboutOtherFormsOfBrowsingHistory(
+    browsing_data::ShouldShowNoticeAboutOtherFormsOfBrowsingHistory(
         sync_service, web_history,
         base::Bind(
             &BrowsingHistoryHandler::OtherFormsOfBrowsingHistoryQueryComplete,

ios/chrome/browser/ui/webui/history/history_ui.mm

@@ -8,7 +8,7 @@
 #include "base/memory/ref_counted_memory.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
-#include "components/browsing_data_ui/history_notice_utils.h"
+#include "components/browsing_data/core/history_notice_utils.h"
 #include "components/grit/components_scaled_resources.h"
 #include "components/keyed_service/core/service_access_type.h"
 #include "components/prefs/pref_service.h"
@@ -146,8 +146,8 @@ HistoryUI::HistoryUI(web::WebUIIOS* web_ui) : web::WebUIIOSController(web_ui) {
   if (url.has_query() && url.query() == "reset_ofbh") {
     ios::ChromeBrowserState::FromWebUIIOS(web_ui)->GetPrefs()->SetInteger(
         prefs::kClearBrowsingDataHistoryNoticeShownTimes, 0);
-    browsing_data_ui::testing::
-        g_override_other_forms_of_browsing_history_query = true;
+    browsing_data::testing::g_override_other_forms_of_browsing_history_query =
+        true;
   }
 
   // Set up the chrome://history-frame/ source.