[Sync] Fix namespaces for the browser_sync component.

ios/chrome/browser/ui/webui/history/browsing_history_handler.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 "ios/chrome/browser/ui/webui/history/browsing_history_handler.h"
 
 #include <stddef.h>
 
 #include <set>
 
@@ skipping 83 matching lines @@
 }
 
 // Returns true if |entry| represents a local visit that had no corresponding
 // visit on the server.
 bool IsLocalOnlyResult(const BrowsingHistoryHandler::HistoryEntry& entry) {
   return entry.entry_type == BrowsingHistoryHandler::HistoryEntry::LOCAL_ENTRY;
 }
 
 // Gets the name and type of a device for the given sync client ID.
 // |name| and |type| are out parameters.
-void GetDeviceNameAndType(const ProfileSyncService* sync_service,
+void GetDeviceNameAndType(const browser_sync::ProfileSyncService* sync_service,
                           const std::string& client_id,
                           std::string* name,
                           std::string* type) {
   // DeviceInfoTracker must be syncing in order for remote history entries to
   // be available.
   DCHECK(sync_service);
   DCHECK(sync_service->GetDeviceInfoTracker());
   DCHECK(sync_service->GetDeviceInfoTracker()->IsSyncing());
 
   std::unique_ptr<sync_driver::DeviceInfo> device_info =
@@ skipping 73 matching lines @@
     else
       base::i18n::AdjustStringForLocaleDirection(&title_to_set);
   }
   result->SetString("title", title_to_set);
 }
 
 std::unique_ptr<base::DictionaryValue>
 BrowsingHistoryHandler::HistoryEntry::ToValue(
     BookmarkModel* bookmark_model,
     SupervisedUserService* supervised_user_service,
-    const ProfileSyncService* sync_service) const {
+    const browser_sync::ProfileSyncService* sync_service) const {
   std::unique_ptr<base::DictionaryValue> result(new base::DictionaryValue());
   SetUrlAndTitle(result.get());
 
   base::string16 domain = url_formatter::IDNToUnicode(url.host());
   // When the domain is empty, use the scheme instead. This allows for a
   // sensible treatment of e.g. file: URLs when group by domain is on.
   if (domain.empty())
     domain = base::UTF8ToUTF16(url.scheme() + ":");
 
   // The items which are to be written into result are also described in
@@ skipping 154 matching lines @@
     web_history_request_ = web_history->QueryHistory(
         search_text, options,
         base::Bind(&BrowsingHistoryHandler::WebHistoryQueryComplete,
                    base::Unretained(this), search_text, options,
                    base::TimeTicks::Now()));
     // Start a timer so we know when to give up.
     web_history_timer_.Start(
         FROM_HERE, base::TimeDelta::FromSeconds(kWebHistoryTimeoutSeconds),
         this, &BrowsingHistoryHandler::WebHistoryTimeout);
 
-    ProfileSyncService* sync_service =
+    browser_sync::ProfileSyncService* sync_service =
         IOSChromeProfileSyncServiceFactory::GetInstance()->GetForBrowserState(
             browser_state);
     // Test the existence of other forms of browsing history.
     browsing_data::ShouldShowNoticeAboutOtherFormsOfBrowsingHistory(
         sync_service, web_history,
         base::Bind(
             &BrowsingHistoryHandler::OtherFormsOfBrowsingHistoryQueryComplete,
             weak_factory_.GetWeakPtr()));
 
     // Set this to false until the results actually arrive.
@@ skipping 200 matching lines @@
     }
   }
   results->swap(new_results);
 }
 
 void BrowsingHistoryHandler::ReturnResultsToFrontEnd() {
   ios::ChromeBrowserState* browser_state =
       ios::ChromeBrowserState::FromWebUIIOS(web_ui());
   BookmarkModel* bookmark_model =
       ios::BookmarkModelFactory::GetForBrowserState(browser_state);
-  ProfileSyncService* sync_service =
+  browser_sync::ProfileSyncService* sync_service =
       IOSChromeProfileSyncServiceFactory::GetForBrowserState(browser_state);
 
   // Combine the local and remote results into |query_results_|, and remove
   // any duplicates.
   if (!web_history_query_results_.empty()) {
     int local_result_count = query_results_.size();
     query_results_.insert(query_results_.end(),
                           web_history_query_results_.begin(),
                           web_history_query_results_.end());
     MergeDuplicateResults(&query_results_);
@@ skipping 246 matching lines @@
 
 void BrowsingHistoryHandler::OnURLsDeleted(
     history::HistoryService* history_service,
     bool all_history,
     bool expired,
     const history::URLRows& deleted_rows,
     const std::set<GURL>& favicon_urls) {
   if (all_history || DeletionsDiffer(deleted_rows, urls_to_be_deleted_))
     web_ui()->CallJavascriptFunction("historyDeleted");
 }