Hide ContentClient getters from embedders so that they they don't reuse content's embedder API. The…

chrome/browser/sync/profile_sync_service_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 "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/values.h"
 #include "chrome/browser/signin/signin_manager.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/signin/token_service.h"
 #include "chrome/browser/signin/token_service_factory.h"
 #include "chrome/browser/sync/glue/bookmark_data_type_controller.h"
 #include "chrome/browser/sync/glue/data_type_controller.h"
 #include "chrome/browser/sync/profile_sync_components_factory_mock.h"
 #include "chrome/browser/sync/test_profile_sync_service.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_pref_service_syncable.h"
 #include "chrome/test/base/testing_profile.h"
-#include "content/public/common/content_client.h"
 #include "content/public/test/test_browser_thread.h"
 #include "google/cacheinvalidation/include/types.h"
 #include "google_apis/gaia/gaia_constants.h"
 #include "sync/js/js_arg_list.h"
 #include "sync/js/js_event_details.h"
 #include "sync/js/js_test_util.h"
 #include "sync/notifier/fake_invalidation_handler.h"
 #include "sync/notifier/invalidator.h"
 #include "sync/notifier/invalidator_test_template.h"
 #include "sync/notifier/object_id_invalidation_map_test_util.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "webkit/user_agent/user_agent.h"
 
 // TODO(akalin): Add tests here that exercise the whole
 // ProfileSyncService/SyncBackendHost stack while mocking out as
 // little as possible.
 
 namespace browser_sync {
 
 namespace {
 
 using content::BrowserThread;
@@ skipping 12 matching lines @@
         file_thread_(BrowserThread::FILE),
         io_thread_(BrowserThread::IO) {}
 
   ~ProfileSyncServiceTestHarness() {}
 
   void SetUp() {
     file_thread_.Start();
     io_thread_.StartIOThread();
     profile.reset(new TestingProfile());
     profile->CreateRequestContext();
-
-    // We need to set the user agent before the backend host can call
-    // webkit_glue::GetUserAgent().
-    webkit_glue::SetUserAgent(content::GetContentClient()->GetUserAgent(),
-                              false);
   }
 
   void TearDown() {
     // Kill the service before the profile.
     if (service.get()) {
       service->Shutdown();
     }
     service.reset();
     profile.reset();
     // Pump messages posted by the sync thread (which may end up
@@ skipping 546 matching lines @@
 namespace syncer {
 namespace {
 
 // ProfileSyncService should behave just like an invalidator.
 INSTANTIATE_TYPED_TEST_CASE_P(
     ProfileSyncServiceInvalidatorTest, InvalidatorTest,
     ::browser_sync::ProfileSyncServiceInvalidatorTestDelegate);
 
 }  // namespace
 }  // namespace syncer