Revert of [Sync] Move //components/sync to the syncer namespace. (patchset #5 id:40001 of https://co

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 <set>
 #include <string>
-#include <vector>
 
 #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"
@@ skipping 12 matching lines @@
 namespace browser_sync {
 class ProfileSyncService;
 }  // namespace browser_sync
 
 namespace history {
 class HistoryService;
 class QueryResults;
 struct QueryOptions;
 }  // namespace history
 
-namespace syncer {
+namespace sync_driver {
 class SyncServiceObserver;
-}  // namespace syncer
+}  // 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 syncer::SyncServiceObserver {
+                               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.
   struct HistoryEntry {
     // Values indicating whether an entry represents only local visits, only
     // remote visits, or a mixture of both.
     enum EntryType {
       EMPTY_ENTRY = 0,
       LOCAL_ENTRY,
@@ skipping 177 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<browser_sync::ProfileSyncService, syncer::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_