[Sync] Fix namespaces for the browser_sync component.

chrome/browser/extensions/api/sessions/sessions_apitest.cc

 // Copyright 2013 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 <stddef.h>
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/macros.h"
@@ skipping 174 matching lines @@
   std::unique_ptr<SyncApiComponentFactoryMock> factory(
       new SyncApiComponentFactoryMock());
 
   factory->SetLocalDeviceInfoProvider(
       std::unique_ptr<sync_driver::LocalDeviceInfoProvider>(
           new sync_driver::LocalDeviceInfoProviderMock(
               kSessionTags[0], "machine name", "Chromium 10k", "Chrome 10k",
               sync_pb::SyncEnums_DeviceType_TYPE_LINUX, "device_id")));
 
   Profile* profile = static_cast<Profile*>(context);
-  ProfileSyncServiceMock* sync_service =
-      new ProfileSyncServiceMock(CreateProfileSyncServiceParamsForTest(
-          base::MakeUnique<browser_sync::ChromeSyncClient>(profile), profile));
+  browser_sync::ProfileSyncServiceMock* sync_service =
+      new browser_sync::ProfileSyncServiceMock(
+          CreateProfileSyncServiceParamsForTest(
+              base::MakeUnique<browser_sync::ChromeSyncClient>(profile),
+              profile));
   static_cast<browser_sync::ChromeSyncClient*>(sync_service->GetSyncClient())
       ->SetSyncApiComponentFactoryForTesting(std::move(factory));
   return base::WrapUnique(sync_service);
 }
 
 void ExtensionSessionsTest::CreateTestProfileSyncService() {
   ProfileManager* profile_manager = g_browser_process->profile_manager();
   base::FilePath path;
   PathService::Get(chrome::DIR_USER_DATA, &path);
   path = path.AppendASCII("test_profile");
   if (!base::PathExists(path))
     CHECK(base::CreateDirectory(path));
   Profile* profile =
       Profile::CreateProfile(path, NULL, Profile::CREATE_MODE_SYNCHRONOUS);
   profile_manager->RegisterTestingProfile(profile, true, false);
-  ProfileSyncServiceMock* service = static_cast<ProfileSyncServiceMock*>(
-      ProfileSyncServiceFactory::GetInstance()->SetTestingFactoryAndUse(
-      profile, &ExtensionSessionsTest::BuildProfileSyncService));
+  browser_sync::ProfileSyncServiceMock* service =
+      static_cast<browser_sync::ProfileSyncServiceMock*>(
+          ProfileSyncServiceFactory::GetInstance()->SetTestingFactoryAndUse(
+              profile, &ExtensionSessionsTest::BuildProfileSyncService));
 
   syncer::ModelTypeSet preferred_types;
   preferred_types.Put(syncer::SESSIONS);
   GoogleServiceAuthError no_error(GoogleServiceAuthError::NONE);
   ON_CALL(*service, IsDataTypeControllerRunning(syncer::SESSIONS))
       .WillByDefault(testing::Return(true));
   ON_CALL(*service, GetRegisteredDataTypes())
       .WillByDefault(testing::Return(syncer::UserTypes()));
   ON_CALL(*service, GetPreferredDataTypes()).WillByDefault(
       testing::Return(preferred_types));
@@ skipping 150 matching lines @@
   EXPECT_EQ(0u, sessions->GetSize());
 }
 
 // http://crbug.com/251199
 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_SessionsApis) {
   ASSERT_TRUE(RunExtensionSubtest("sessions",
                                   "sessions.html")) << message_;
 }
 
 }  // namespace extensions