[Sync] Fix namespaces for the browser_sync component.

chrome/browser/ui/webui/browsing_history_handler.cc

 // Copyright 2015 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 "chrome/browser/ui/webui/browsing_history_handler.h"
 
 #include <stddef.h>
 
 #include <set>
 #include <utility>
@@ skipping 118 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 76 matching lines @@
 
   result->SetString("title",
       limit_title_length ? title_to_set.substr(0, kShortTitleLength)
                          : title_to_set);
 }
 
 std::unique_ptr<base::DictionaryValue>
 BrowsingHistoryHandler::HistoryEntry::ToValue(
     BookmarkModel* bookmark_model,
     SupervisedUserService* supervised_user_service,
-    const ProfileSyncService* sync_service,
+    const browser_sync::ProfileSyncService* sync_service,
     bool limit_title_length) const {
   std::unique_ptr<base::DictionaryValue> result(new base::DictionaryValue());
   SetUrlAndTitle(result.get(), limit_title_length);
 
   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() + ":");
 
@@ skipping 118 matching lines @@
 
   // Get notifications when web history is deleted.
   history::WebHistoryService* web_history =
       WebHistoryServiceFactory::GetForProfile(profile);
   if (web_history) {
     web_history_service_observer_.Add(web_history);
   } else {
     // If |web_history| is not available, it means that the history sync is
     // disabled. Observe |sync_service| so that we can attach the listener
     // in case it gets enabled later.
-    ProfileSyncService* sync_service =
+    browser_sync::ProfileSyncService* sync_service =
         ProfileSyncServiceFactory::GetForProfile(profile);
     if (sync_service)
       sync_service_observer_.Add(sync_service);
   }
 
   web_ui()->RegisterMessageCallback("queryHistory",
       base::Bind(&BrowsingHistoryHandler::HandleQueryHistory,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("removeVisits",
       base::Bind(&BrowsingHistoryHandler::HandleRemoveVisits,
@@ skipping 373 matching lines @@
 void BrowsingHistoryHandler::ReturnResultsToFrontEnd() {
   Profile* profile = Profile::FromWebUI(web_ui());
   BookmarkModel* bookmark_model =
       BookmarkModelFactory::GetForBrowserContext(profile);
   SupervisedUserService* supervised_user_service = NULL;
 #if defined(ENABLE_SUPERVISED_USERS)
   if (profile->IsSupervised())
     supervised_user_service =
         SupervisedUserServiceFactory::GetForProfile(profile);
 #endif
-  ProfileSyncService* sync_service =
+  browser_sync::ProfileSyncService* sync_service =
       ProfileSyncServiceFactory::GetInstance()->GetForProfile(profile);
 
   // 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 224 matching lines @@
     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()->CallJavascriptFunctionUnsafe("historyDeleted");
 }
 
 void BrowsingHistoryHandler::OnWebHistoryDeleted() {
   web_ui()->CallJavascriptFunctionUnsafe("historyDeleted");
 }