[Sync] Move //components/sync to the syncer namespace, take 2.

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/core/history_notice_utils.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
@@ skipping 42 matching lines @@
 
 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,
+    const syncer::SyncService* sync_service,
     history::WebHistoryService* history_service,
     base::Callback<void(bool)> callback) {
   if (!sync_service ||
       !sync_service->IsSyncActive() ||
       !sync_service->GetActiveDataTypes().Has(
           syncer::HISTORY_DELETE_DIRECTIVES) ||
       sync_service->IsUsingSecondaryPassphrase() ||
       !history_service) {
     callback.Run(false);
     return;
   }
 
   history_service->QueryWebAndAppActivity(callback);
 }
 
 void ShouldPopupDialogAboutOtherFormsOfBrowsingHistory(
-    const sync_driver::SyncService* sync_service,
+    const syncer::SyncService* sync_service,
     history::WebHistoryService* history_service,
     version_info::Channel channel,
     base::Callback<void(bool)> callback) {
   // If the query for other forms of browsing history is overriden for testing,
   // the conditions are identical with
   // ShouldShowNoticeAboutOtherFormsOfBrowsingHistory.
   if (testing::g_override_other_forms_of_browsing_history_query) {
     ShouldShowNoticeAboutOtherFormsOfBrowsingHistory(
         sync_service, history_service, callback);
     return;
@@ skipping 15 matching lines @@
   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