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

ios/chrome/browser/ui/webui/sync_internals/sync_internals_message_handler.cc

Index: ios/chrome/browser/ui/webui/sync_internals/sync_internals_message_handler.cc
diff --git a/ios/chrome/browser/ui/webui/sync_internals/sync_internals_message_handler.cc b/ios/chrome/browser/ui/webui/sync_internals/sync_internals_message_handler.cc
index 97060f10179b3b9d6c5b454ebbca311e8231492d..deebef123bf43eef5cf4f83b29c908e8e705ea61 100644
--- a/ios/chrome/browser/ui/webui/sync_internals/sync_internals_message_handler.cc
+++ b/ios/chrome/browser/ui/webui/sync_internals/sync_internals_message_handler.cc
@@ -37,7 +37,7 @@ SyncInternalsMessageHandler::~SyncInternalsMessageHandler() {
   if (js_controller_)
     js_controller_->RemoveJsEventHandler(this);
 
-  syncer::SyncService* service = GetSyncService();
+  sync_driver::SyncService* service = GetSyncService();
   if (service && service->HasObserver(this)) {
     service->RemoveObserver(this);
     service->RemoveProtocolEventObserver(this);
@@ -52,27 +52,27 @@ void SyncInternalsMessageHandler::RegisterMessages() {
   DCHECK_CURRENTLY_ON(web::WebThread::UI);
 
   web_ui()->RegisterMessageCallback(
-      syncer::sync_ui_util::kRegisterForEvents,
+      sync_driver::sync_ui_util::kRegisterForEvents,
       base::Bind(&SyncInternalsMessageHandler::HandleRegisterForEvents,
                  base::Unretained(this)));
 
   web_ui()->RegisterMessageCallback(
-      syncer::sync_ui_util::kRegisterForPerTypeCounters,
+      sync_driver::sync_ui_util::kRegisterForPerTypeCounters,
       base::Bind(&SyncInternalsMessageHandler::HandleRegisterForPerTypeCounters,
                  base::Unretained(this)));
 
   web_ui()->RegisterMessageCallback(
-      syncer::sync_ui_util::kRequestUpdatedAboutInfo,
+      sync_driver::sync_ui_util::kRequestUpdatedAboutInfo,
       base::Bind(&SyncInternalsMessageHandler::HandleRequestUpdatedAboutInfo,
                  base::Unretained(this)));
 
   web_ui()->RegisterMessageCallback(
-      syncer::sync_ui_util::kRequestListOfTypes,
+      sync_driver::sync_ui_util::kRequestListOfTypes,
       base::Bind(&SyncInternalsMessageHandler::HandleRequestListOfTypes,
                  base::Unretained(this)));
 
   web_ui()->RegisterMessageCallback(
-      syncer::sync_ui_util::kGetAllNodes,
+      sync_driver::sync_ui_util::kGetAllNodes,
       base::Bind(&SyncInternalsMessageHandler::HandleGetAllNodes,
                  base::Unretained(this)));
 }
@@ -84,7 +84,7 @@ void SyncInternalsMessageHandler::HandleRegisterForEvents(
   // is_registered_ flag protects us from double-registering.  This could
   // happen on a page refresh, where the JavaScript gets re-run but the
   // message handler remains unchanged.
-  syncer::SyncService* service = GetSyncService();
+  sync_driver::SyncService* service = GetSyncService();
   if (service && !is_registered_) {
     service->AddObserver(this);
     service->AddProtocolEventObserver(this);
@@ -98,7 +98,7 @@ void SyncInternalsMessageHandler::HandleRegisterForPerTypeCounters(
     const base::ListValue* args) {
   DCHECK(args->empty());
 
-  if (syncer::SyncService* service = GetSyncService()) {
+  if (sync_driver::SyncService* service = GetSyncService()) {
     if (!is_registered_for_counters_) {
       service->AddTypeDebugInfoObserver(this);
       is_registered_for_counters_ = true;
@@ -126,10 +126,10 @@ void SyncInternalsMessageHandler::HandleRequestListOfTypes(
        it.Inc()) {
     type_list->Append(new base::StringValue(ModelTypeToString(it.Get())));
   }
-  event_details.Set(syncer::sync_ui_util::kTypes, type_list.release());
+  event_details.Set(sync_driver::sync_ui_util::kTypes, type_list.release());
   web_ui()->CallJavascriptFunction(
-      syncer::sync_ui_util::kDispatchEvent,
-      base::StringValue(syncer::sync_ui_util::kOnReceivedListOfTypes),
+      sync_driver::sync_ui_util::kDispatchEvent,
+      base::StringValue(sync_driver::sync_ui_util::kOnReceivedListOfTypes),
       event_details);
 }
 
@@ -140,7 +140,7 @@ void SyncInternalsMessageHandler::HandleGetAllNodes(
   bool success = args->GetInteger(0, &request_id);
   DCHECK(success);
 
-  syncer::SyncService* service = GetSyncService();
+  sync_driver::SyncService* service = GetSyncService();
   if (service) {
     service->GetAllNodes(
         base::Bind(&SyncInternalsMessageHandler::OnReceivedAllNodes,
@@ -152,8 +152,8 @@ void SyncInternalsMessageHandler::OnReceivedAllNodes(
     int request_id,
     std::unique_ptr<base::ListValue> nodes) {
   base::FundamentalValue id(request_id);
-  web_ui()->CallJavascriptFunction(syncer::sync_ui_util::kGetAllNodesCallback,
-                                   id, *nodes);
+  web_ui()->CallJavascriptFunction(
+      sync_driver::sync_ui_util::kGetAllNodesCallback, id, *nodes);
 }
 
 void SyncInternalsMessageHandler::OnStateChanged() {
@@ -165,26 +165,29 @@ void SyncInternalsMessageHandler::OnProtocolEvent(
   std::unique_ptr<base::DictionaryValue> value(
       syncer::ProtocolEvent::ToValue(event));
   web_ui()->CallJavascriptFunction(
-      syncer::sync_ui_util::kDispatchEvent,
-      base::StringValue(syncer::sync_ui_util::kOnProtocolEvent), *value);
+      sync_driver::sync_ui_util::kDispatchEvent,
+      base::StringValue(sync_driver::sync_ui_util::kOnProtocolEvent), *value);
 }
 
 void SyncInternalsMessageHandler::OnCommitCountersUpdated(
     syncer::ModelType type,
     const syncer::CommitCounters& counters) {
-  EmitCounterUpdate(type, syncer::sync_ui_util::kCommit, counters.ToValue());
+  EmitCounterUpdate(type, sync_driver::sync_ui_util::kCommit,
+                    counters.ToValue());
 }
 
 void SyncInternalsMessageHandler::OnUpdateCountersUpdated(
     syncer::ModelType type,
     const syncer::UpdateCounters& counters) {
-  EmitCounterUpdate(type, syncer::sync_ui_util::kUpdate, counters.ToValue());
+  EmitCounterUpdate(type, sync_driver::sync_ui_util::kUpdate,
+                    counters.ToValue());
 }
 
 void SyncInternalsMessageHandler::OnStatusCountersUpdated(
     syncer::ModelType type,
     const syncer::StatusCounters& counters) {
-  EmitCounterUpdate(type, syncer::sync_ui_util::kStatus, counters.ToValue());
+  EmitCounterUpdate(type, sync_driver::sync_ui_util::kStatus,
+                    counters.ToValue());
 }
 
 void SyncInternalsMessageHandler::EmitCounterUpdate(
@@ -192,19 +195,21 @@ void SyncInternalsMessageHandler::EmitCounterUpdate(
     const std::string& counter_type,
     std::unique_ptr<base::DictionaryValue> value) {
   std::unique_ptr<base::DictionaryValue> details(new base::DictionaryValue());
-  details->SetString(syncer::sync_ui_util::kModelType, ModelTypeToString(type));
-  details->SetString(syncer::sync_ui_util::kCounterType, counter_type);
-  details->Set(syncer::sync_ui_util::kCounters, value.release());
+  details->SetString(sync_driver::sync_ui_util::kModelType,
+                     ModelTypeToString(type));
+  details->SetString(sync_driver::sync_ui_util::kCounterType, counter_type);
+  details->Set(sync_driver::sync_ui_util::kCounters, value.release());
   web_ui()->CallJavascriptFunction(
-      syncer::sync_ui_util::kDispatchEvent,
-      base::StringValue(syncer::sync_ui_util::kOnCountersUpdated), *details);
+      sync_driver::sync_ui_util::kDispatchEvent,
+      base::StringValue(sync_driver::sync_ui_util::kOnCountersUpdated),
+      *details);
 }
 
 void SyncInternalsMessageHandler::HandleJsEvent(const std::string& name,
                                                 const JsEventDetails& details) {
   DVLOG(1) << "Handling event: " << name << " with details "
            << details.ToString();
-  web_ui()->CallJavascriptFunction(syncer::sync_ui_util::kDispatchEvent,
+  web_ui()->CallJavascriptFunction(sync_driver::sync_ui_util::kDispatchEvent,
                                    base::StringValue(name), details.Get());
 }
 
@@ -213,17 +218,18 @@ void SyncInternalsMessageHandler::SendAboutInfo() {
       ios::ChromeBrowserState::FromWebUIIOS(web_ui());
   SigninManager* signin_manager =
       ios::SigninManagerFactory::GetForBrowserState(browser_state);
-  syncer::SyncService* sync_service = GetSyncService();
+  sync_driver::SyncService* sync_service = GetSyncService();
   std::unique_ptr<base::DictionaryValue> value =
-      syncer::sync_ui_util::ConstructAboutInformation(
+      sync_driver::sync_ui_util::ConstructAboutInformation(
           sync_service, signin_manager, GetChannel());
   web_ui()->CallJavascriptFunction(
-      syncer::sync_ui_util::kDispatchEvent,
-      base::StringValue(syncer::sync_ui_util::kOnAboutInfoUpdated), *value);
+      sync_driver::sync_ui_util::kDispatchEvent,
+      base::StringValue(sync_driver::sync_ui_util::kOnAboutInfoUpdated),
+      *value);
 }
 
 // Gets the SyncService of the underlying original profile. May return null.
-syncer::SyncService* SyncInternalsMessageHandler::GetSyncService() {
+sync_driver::SyncService* SyncInternalsMessageHandler::GetSyncService() {
   ios::ChromeBrowserState* browser_state =
       ios::ChromeBrowserState::FromWebUIIOS(web_ui());
   return IOSChromeProfileSyncServiceFactory::GetForBrowserState(