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

content/browser/tab_contents/tab_contents_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/logging.h"
 #include "base/utf_string_conversions.h"
 #include "content/browser/mock_content_browser_client.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/renderer_host/test_render_view_host.h"
 #include "content/browser/site_instance_impl.h"
@@ skipping 263 matching lines @@
         old_browser_client_(NULL) {
   }
 
   virtual void SetUp() {
     // These tests treat tabcontentstest as a privileged WebUI scheme.
     // We must register it similarly to kChromeUIScheme.
     url_util::AddStandardScheme("tabcontentstest");
 
     old_client_ = content::GetContentClient();
     old_browser_client_ = content::GetContentClient()->browser();
-    content::SetContentClient(&client_);
+    old_user_agent_ = content::GetUserAgent();
+    content::Initialize(&client_, "TabContentsTest");
     content::GetContentClient()->set_browser(&browser_client_);
     RenderViewHostImplTestHarness::SetUp();
   }
 
   virtual void TearDown() {
     content::GetContentClient()->set_browser(old_browser_client_);
-    content::SetContentClient(old_client_);
+    content::Initialize(old_client_, old_user_agent_);
     RenderViewHostImplTestHarness::TearDown();
   }
 
  private:
   TabContentsTestClient client_;
   TabContentsTestBrowserClient browser_client_;
   content::TestBrowserThread ui_thread_;
   content::ContentClient* old_client_;
   content::ContentBrowserClient* old_browser_client_;
+  std::string old_user_agent_;
 };
 
 }  // namespace
 
 // Test to make sure that title updates get stripped of whitespace.
 TEST_F(TabContentsTest, UpdateTitle) {
   NavigationControllerImpl& cont =
       static_cast<NavigationControllerImpl&>(controller());
   ViewHostMsg_FrameNavigate_Params params;
   InitNavigateParams(&params, 0, GURL(chrome::kAboutBlankURL),
@@ skipping 1617 matching lines @@
   // It should have a transient entry.
   EXPECT_TRUE(other_controller.GetTransientEntry());
 
   // And the interstitial should be showing.
   EXPECT_TRUE(other_contents->ShowingInterstitialPage());
 
   // And the interstitial should do a reload on don't proceed.
   EXPECT_TRUE(static_cast<InterstitialPageImpl*>(
       other_contents->GetInterstitialPage())->reload_on_dont_proceed());
 }