[Sync] Fix namespaces for the browser_sync component.

chrome/browser/ui/webui/browsing_history_handler.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_WEBUI_BROWSING_HISTORY_HANDLER_H_
 #define CHROME_BROWSER_UI_WEBUI_BROWSING_HISTORY_HANDLER_H_
 
 #include <stdint.h>
 
 #include <memory>
 #include <string>
 
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/scoped_observer.h"
 #include "base/strings/string16.h"
 #include "base/task/cancelable_task_tracker.h"
 #include "base/timer/timer.h"
 #include "base/values.h"
 #include "components/history/core/browser/history_service_observer.h"
 #include "components/history/core/browser/url_row.h"
 #include "components/history/core/browser/web_history_service.h"
 #include "components/history/core/browser/web_history_service_observer.h"
 #include "components/sync/driver/sync_service_observer.h"
 #include "content/public/browser/web_ui_message_handler.h"
 #include "url/gurl.h"
 
-class ProfileSyncService;
 class SupervisedUserService;
 
 namespace bookmarks {
 class BookmarkModel;
-}
+}  // namespace bookmarks
+
+namespace browser_sync {
+class ProfileSyncService;
+}  // namespace browser_sync
 
 namespace history {
 class HistoryService;
+class QueryResults;
 struct QueryOptions;
-class QueryResults;
-}
+}  // namespace history
 
 namespace sync_driver {
 class SyncServiceObserver;
-}
+}  // namespace sync_driver
 
 // The handler for Javascript messages related to the "history" view.
 class BrowsingHistoryHandler : public content::WebUIMessageHandler,
                                public history::HistoryServiceObserver,
                                public history::WebHistoryServiceObserver,
                                public sync_driver::SyncServiceObserver {
  public:
   // Represents a history entry to be shown to the user, representing either
   // a local or remote visit. A single entry can represent multiple visits,
   // since only the most recent visit on a particular day is shown.
@@ skipping 16 matching lines @@
     virtual ~HistoryEntry();
 
     // Formats this entry's URL and title and adds them to |result|.
     void SetUrlAndTitle(base::DictionaryValue* result,
                         bool limit_title_length) const;
 
     // Converts the entry to a DictionaryValue to be owned by the caller.
     std::unique_ptr<base::DictionaryValue> ToValue(
         bookmarks::BookmarkModel* bookmark_model,
         SupervisedUserService* supervised_user_service,
-        const ProfileSyncService* sync_service,
+        const browser_sync::ProfileSyncService* sync_service,
         bool limit_title_length) const;
 
     // Comparison function for sorting HistoryEntries from newest to oldest.
     static bool SortByTimeDescending(
         const HistoryEntry& entry1, const HistoryEntry& entry2);
 
     // The type of visits this entry represents: local, remote, or both.
     EntryType entry_type;
 
     GURL url;
@@ skipping 146 matching lines @@
 
   // HistoryService (local history) observer.
   ScopedObserver<history::HistoryService, history::HistoryServiceObserver>
       history_service_observer_;
 
   // WebHistoryService (synced history) observer.
   ScopedObserver<history::WebHistoryService, history::WebHistoryServiceObserver>
       web_history_service_observer_;
 
   // ProfileSyncService observer listens to late initialization of history sync.
-  ScopedObserver<ProfileSyncService, sync_driver::SyncServiceObserver>
+  ScopedObserver<browser_sync::ProfileSyncService,
+                 sync_driver::SyncServiceObserver>
       sync_service_observer_;
 
   // Whether the last call to Web History returned synced results.
   bool has_synced_results_;
 
   // Whether there are other forms of browsing history on the history server.
   bool has_other_forms_of_browsing_history_;
 
   base::WeakPtrFactory<BrowsingHistoryHandler> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowsingHistoryHandler);
 };
 
 #endif  // CHROME_BROWSER_UI_WEBUI_BROWSING_HISTORY_HANDLER_H_