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

components/browsing_data/core/history_notice_utils.h

Index: components/browsing_data/core/history_notice_utils.h
diff --git a/components/browsing_data_ui/history_notice_utils.h b/components/browsing_data/core/history_notice_utils.h
similarity index 87%
rename from components/browsing_data_ui/history_notice_utils.h
rename to components/browsing_data/core/history_notice_utils.h
index bd3242e44775bb8335367b1cdeedf9f1c0d00caa..338969b9c89188ac794a87bfc920c8bdbc797724 100644
--- a/components/browsing_data_ui/history_notice_utils.h
+++ b/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_