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

components/sync/device_info/local_device_info_provider_impl.cc

Index: components/sync/device_info/local_device_info_provider_impl.cc
diff --git a/components/sync/device_info/local_device_info_provider_impl.cc b/components/sync/device_info/local_device_info_provider_impl.cc
index 836bcbad685ee0fee5219b48de87a77b7a4f2335..a50b5fa6e4dd406e3b4aff4fae72e5929164cb60 100644
--- a/components/sync/device_info/local_device_info_provider_impl.cc
+++ b/components/sync/device_info/local_device_info_provider_impl.cc
@@ -10,7 +10,7 @@
 #include "components/sync/base/get_session_name.h"
 #include "components/sync/driver/sync_util.h"
 
-namespace syncer {
+namespace browser_sync {
 
 namespace {
 
@@ -46,7 +46,8 @@ LocalDeviceInfoProviderImpl::LocalDeviceInfoProviderImpl(
 
 LocalDeviceInfoProviderImpl::~LocalDeviceInfoProviderImpl() {}
 
-const DeviceInfo* LocalDeviceInfoProviderImpl::GetLocalDeviceInfo() const {
+const sync_driver::DeviceInfo* LocalDeviceInfoProviderImpl::GetLocalDeviceInfo()
+    const {
   DCHECK(CalledOnValidThread());
   return local_device_info_.get();
 }
@@ -61,7 +62,7 @@ std::string LocalDeviceInfoProviderImpl::GetLocalSyncCacheGUID() const {
   return cache_guid_;
 }
 
-std::unique_ptr<LocalDeviceInfoProvider::Subscription>
+std::unique_ptr<sync_driver::LocalDeviceInfoProvider::Subscription>
 LocalDeviceInfoProviderImpl::RegisterOnInitializedCallback(
     const base::Closure& callback) {
   DCHECK(CalledOnValidThread());
@@ -77,7 +78,7 @@ void LocalDeviceInfoProviderImpl::Initialize(
   DCHECK(!cache_guid.empty());
   cache_guid_ = cache_guid;
 
-  GetSessionName(
+  syncer::GetSessionName(
       blocking_task_runner,
       base::Bind(&LocalDeviceInfoProviderImpl::InitializeContinuation,
                  weak_factory_.GetWeakPtr(), cache_guid,
@@ -94,9 +95,9 @@ void LocalDeviceInfoProviderImpl::InitializeContinuation(
     return;
   }
 
-  local_device_info_.reset(
-      new DeviceInfo(guid, session_name, version_, GetSyncUserAgent(),
-                     GetLocalDeviceType(is_tablet_), signin_scoped_device_id));
+  local_device_info_.reset(new sync_driver::DeviceInfo(
+      guid, session_name, version_, GetSyncUserAgent(),
+      GetLocalDeviceType(is_tablet_), signin_scoped_device_id));
 
   // Notify observers.
   callback_list_.Notify();
@@ -108,4 +109,4 @@ void LocalDeviceInfoProviderImpl::Clear() {
   local_device_info_.reset();
 }
 
-}  // namespace syncer
+}  // namespace browser_sync