Move --user-agent overriding logic from chrome into content.

content/test/content_test_suite.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 "content/test/content_test_suite.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/browser/mock_content_browser_client.h"
 #include "content/browser/notification_service_impl.h"
@@ skipping 13 matching lines @@
 class TestContentClientInitializer : public testing::EmptyTestEventListener {
  public:
   TestContentClientInitializer() {
   }
 
   virtual void OnTestStart(const testing::TestInfo& test_info) OVERRIDE {
     notification_service_.reset(new NotificationServiceImpl());
 
     DCHECK(!content::GetContentClient());
     content_client_.reset(new TestContentClient);
-    content::SetContentClient(content_client_.get());
+    content::Initialize(content_client_.get(), "TestContentClient");
 
     content_browser_client_.reset(new content::MockContentBrowserClient());
     content_client_->set_browser(content_browser_client_.get());
   }
 
   virtual void OnTestEnd(const testing::TestInfo& test_info) OVERRIDE {
     notification_service_.reset();
 
     DCHECK_EQ(content_client_.get(), content::GetContentClient());
-    content::SetContentClient(NULL);
+    content::Uninitialize();
     content_client_.reset();
 
     content_browser_client_.reset();
   }
 
  private:
   scoped_ptr<NotificationServiceImpl> notification_service_;
   scoped_ptr<content::ContentClient> content_client_;
   scoped_ptr<content::ContentBrowserClient> content_browser_client_;
 
@@ skipping 19 matching lines @@
   content::RegisterPathProvider();
   ui::RegisterPathProvider();
 
   // Mock out the compositor on platforms that use it.
   ui::SetupTestCompositor();
 
   testing::TestEventListeners& listeners =
       testing::UnitTest::GetInstance()->listeners();
   listeners.Append(new TestContentClientInitializer);
 }
-