[Sync] Fix namespaces for the browser_sync component.

components/browser_sync/profile_sync_service_startup_unittest.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 <memory>
 #include <utility>
 
 #include "base/files/file_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_task_runner_handle.h"
@@ skipping 15 matching lines @@
 #include "components/sync/driver/sync_prefs.h"
 #include "components/sync/driver/sync_service_observer.h"
 #include "components/syncable_prefs/pref_service_syncable.h"
 #include "google_apis/gaia/gaia_auth_consumer.h"
 #include "google_apis/gaia/gaia_constants.h"
 #include "google_apis/gaia/oauth2_token_service.h"
 #include "net/url_request/url_request_test_util.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-using browser_sync::SyncBackendHostMock;
 using sync_driver::DataTypeManager;
 using sync_driver::DataTypeManagerMock;
 using testing::_;
 using testing::AnyNumber;
 using testing::DoAll;
 using testing::Mock;
 using testing::Return;
 
+namespace browser_sync {
+
 namespace {
 
 const char kGaiaId[] = "12345";
 const char kEmail[] = "test_user@gmail.com";
 const char kDummyPassword[] = "";
 
 class SyncServiceObserverMock : public sync_driver::SyncServiceObserver {
  public:
   SyncServiceObserverMock();
   virtual ~SyncServiceObserverMock();
@@ skipping 26 matching lines @@
         ->set_auto_post_fetch_response_on_message_loop(true);
   }
 
   ~ProfileSyncServiceStartupTest() override {
     sync_service_->RemoveObserver(&observer_);
     sync_service_->Shutdown();
   }
 
   void CreateSyncService(ProfileSyncService::StartBehavior start_behavior) {
     component_factory_ = profile_sync_service_bundle_.component_factory();
-    browser_sync::ProfileSyncServiceBundle::SyncClientBuilder builder(
+    ProfileSyncServiceBundle::SyncClientBuilder builder(
         &profile_sync_service_bundle_);
     ProfileSyncService::InitParams init_params =
         profile_sync_service_bundle_.CreateBasicInitParams(start_behavior,
                                                            builder.Build());
 
     sync_service_.reset(new ProfileSyncService(std::move(init_params)));
     sync_service_->RegisterDataTypeController(
         base::MakeUnique<sync_driver::FakeDataTypeController>(
             syncer::BOOKMARKS));
     sync_service_->AddObserver(&observer_);
@@ skipping 30 matching lines @@
     return account_id;
   }
 
   DataTypeManagerMock* SetUpDataTypeManager() {
     DataTypeManagerMock* data_type_manager = new DataTypeManagerMock();
     EXPECT_CALL(*component_factory_, CreateDataTypeManager(_, _, _, _, _))
         .WillOnce(Return(data_type_manager));
     return data_type_manager;
   }
 
-  browser_sync::SyncBackendHostMock* SetUpSyncBackendHost() {
-    browser_sync::SyncBackendHostMock* sync_backend_host =
-        new browser_sync::SyncBackendHostMock();
+  SyncBackendHostMock* SetUpSyncBackendHost() {
+    SyncBackendHostMock* sync_backend_host = new SyncBackendHostMock();
     EXPECT_CALL(*component_factory_, CreateSyncBackendHost(_, _, _, _))
         .WillOnce(Return(sync_backend_host));
     return sync_backend_host;
   }
 
   PrefService* pref_service() {
     return profile_sync_service_bundle_.pref_service();
   }
 
   base::MessageLoop message_loop_;
-  browser_sync::ProfileSyncServiceBundle profile_sync_service_bundle_;
+  ProfileSyncServiceBundle profile_sync_service_bundle_;
   std::unique_ptr<ProfileSyncService> sync_service_;
   SyncServiceObserverMock observer_;
   sync_driver::DataTypeStatusTable data_type_status_table_;
   SyncApiComponentFactoryMock* component_factory_ = nullptr;
 };
 
 class ProfileSyncServiceStartupCrosTest : public ProfileSyncServiceStartupTest {
  public:
   ProfileSyncServiceStartupCrosTest() {
     CreateSyncService(ProfileSyncService::AUTO_START);
@@ skipping 306 matching lines @@
   pref_service()->ClearPref(sync_driver::prefs::kSyncFirstSetupComplete);
 
   EXPECT_CALL(observer_, OnStateChanged()).Times(AnyNumber());
   sync_service_->Initialize();
 
   auto sync_blocker = sync_service_->GetSetupInProgressHandle();
   IssueTestTokens(account_id);
   sync_blocker.reset();
   EXPECT_FALSE(sync_service_->IsSyncActive());
 }
+
+}  // namespace browser_sync