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

components/browsing_data/core/history_notice_utils.cc

 // 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.
 
-#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"
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/stringprintf.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "components/history/core/browser/web_history_service.h"
 #include "components/sync/driver/sync_service.h"
 #include "components/version_info/version_info.h"
@@ skipping 28 matching lines @@
 
  private:
   int expected_call_count_;
   base::Callback<void(bool)> target_callback_;
   bool final_response_;
   int call_count_;
 };
 
 }  // namespace
 
-namespace browsing_data_ui {
+namespace browsing_data {
 
 namespace testing {
 
 bool g_override_other_forms_of_browsing_history_query = false;
 
 }  // namespace testing
 
 void ShouldShowNoticeAboutOtherFormsOfBrowsingHistory(
     const sync_driver::SyncService* sync_service,
     history::WebHistoryService* history_service,
@@ skipping 40 matching lines @@
   // after processing both callbacks.
   MergeBooleanCallbacks* merger = new MergeBooleanCallbacks(2, callback);
   history_service->QueryWebAndAppActivity(base::Bind(
       &MergeBooleanCallbacks::RunCallback, base::Unretained(merger)));
   history_service->QueryOtherFormsOfBrowsingHistory(
       channel,
       base::Bind(
           &MergeBooleanCallbacks::RunCallback, base::Unretained(merger)));
 }
 
-}  // namespace browsing_data_ui
+}  // namespace browsing_data