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

components/sync_bookmarks/bookmark_data_type_controller.cc

 // Copyright (c) 2012 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/sync_bookmarks/bookmark_data_type_controller.h"
 
 #include "base/metrics/histogram.h"
 #include "components/bookmarks/browser/bookmark_model.h"
 #include "components/history/core/browser/history_service.h"
 #include "components/sync/driver/sync_api_component_factory.h"
 #include "components/sync/driver/sync_client.h"
 
 using bookmarks::BookmarkModel;
 
 namespace sync_bookmarks {
 
 BookmarkDataTypeController::BookmarkDataTypeController(
     const base::Closure& dump_stack,
-    syncer::SyncClient* sync_client)
-    : syncer::FrontendDataTypeController(syncer::BOOKMARKS,
-                                         dump_stack,
-                                         sync_client),
+    sync_driver::SyncClient* sync_client)
+    : FrontendDataTypeController(syncer::BOOKMARKS, dump_stack, sync_client),
       history_service_observer_(this),
       bookmark_model_observer_(this) {}
 
 BookmarkDataTypeController::~BookmarkDataTypeController() {}
 
 bool BookmarkDataTypeController::StartModels() {
   DCHECK(CalledOnValidThread());
   if (!DependentsLoaded()) {
     BookmarkModel* bookmark_model = sync_client_->GetBookmarkModel();
     bookmark_model_observer_.Add(bookmark_model);
     history::HistoryService* history_service =
         sync_client_->GetHistoryService();
     history_service_observer_.Add(history_service);
     return false;
   }
   return true;
 }
 
 void BookmarkDataTypeController::CleanUpState() {
   DCHECK(CalledOnValidThread());
   history_service_observer_.RemoveAll();
   bookmark_model_observer_.RemoveAll();
 }
 
 void BookmarkDataTypeController::CreateSyncComponents() {
   DCHECK(CalledOnValidThread());
-  syncer::SyncApiComponentFactory::SyncComponents sync_components =
+  sync_driver::SyncApiComponentFactory::SyncComponents sync_components =
       sync_client_->GetSyncApiComponentFactory()->CreateBookmarkSyncComponents(
           sync_client_->GetSyncService(), CreateErrorHandler());
   set_model_associator(sync_components.model_associator);
   set_change_processor(sync_components.change_processor);
 }
 
 void BookmarkDataTypeController::BookmarkModelChanged() {
 }
 
 void BookmarkDataTypeController::BookmarkModelLoaded(BookmarkModel* model,
@@ skipping 42 matching lines @@
   bookmark_model_observer_.RemoveAll();
   OnModelLoaded();
 }
 
 void BookmarkDataTypeController::HistoryServiceBeingDeleted(
     history::HistoryService* history_service) {
   CleanUpState();
 }
 
 }  // namespace sync_bookmarks