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

content/browser/site_instance_impl_unittest.cc

Index: content/browser/site_instance_impl_unittest.cc
diff --git a/content/browser/site_instance_impl_unittest.cc b/content/browser/site_instance_impl_unittest.cc
index 39905a12ffba1cbf8158b3dd84e3ef23b294fd89..15596461643e7e34c5451db753ddb8ca8bfb2609 100644
--- a/content/browser/site_instance_impl_unittest.cc
+++ b/content/browser/site_instance_impl_unittest.cc
@@ -119,7 +119,8 @@ class SiteInstanceTest : public testing::Test {
   virtual void SetUp() {
     old_client_ = content::GetContentClient();
     old_browser_client_ = content::GetContentClient()->browser();
-    content::SetContentClient(&client_);
+    old_user_agent_ = content::GetUserAgent(GURL());
+    content::Initialize(&client_, "SiteInstanceTest");

[scherkus (not reviewing), 2012/04/05 23:20:45]

is this ContentClient swapping necessary? :(

[Dirk Pranke, 2012/04/05 23:35:54]

I don't know this code; looks like it was added in r126949 by creis, so we might
need him or jam to comment.

     content::GetContentClient()->set_browser(&browser_client_);
     url_util::AddStandardScheme(kPrivilegedScheme);
     url_util::AddStandardScheme(chrome::kChromeUIScheme);
@@ -127,7 +128,7 @@ class SiteInstanceTest : public testing::Test {
 
   virtual void TearDown() {
     content::GetContentClient()->set_browser(old_browser_client_);

[scherkus (not reviewing), 2012/04/05 23:20:45]

is this line actually needed?

I don't believe we change the browser of old_browser_client_...

-    content::SetContentClient(old_client_);
+    content::Initialize(old_client_, old_user_agent_);
   }
 
   void set_privileged_process_id(int process_id) {
@@ -142,6 +143,7 @@ class SiteInstanceTest : public testing::Test {
   SiteInstanceTestBrowserClient browser_client_;
   content::ContentClient* old_client_;
   content::ContentBrowserClient* old_browser_client_;
+  std::string old_user_agent_;
 };
 
 class TestBrowsingInstance : public BrowsingInstance {