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

content/browser/site_instance_impl_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/compiler_specific.h"
 #include "base/stl_util.h"
 #include "base/string16.h"
 #include "content/browser/browser_thread_impl.h"
 #include "content/browser/browsing_instance.h"
 #include "content/browser/child_process_security_policy_impl.h"
@@ skipping 101 matching lines @@
  public:
   SiteInstanceTest()
       : ui_thread_(BrowserThread::UI, &message_loop_),
         old_client_(NULL),
         old_browser_client_(NULL) {
   }
 
   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);
   }
 
   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) {
     browser_client_.set_privileged_process_id(process_id);
   }
 
  private:
   MessageLoopForUI message_loop_;
   BrowserThreadImpl ui_thread_;
 
   SiteInstanceTestClient client_;
   SiteInstanceTestBrowserClient browser_client_;
   content::ContentClient* old_client_;
   content::ContentBrowserClient* old_browser_client_;
+  std::string old_user_agent_;
 };
 
 class TestBrowsingInstance : public BrowsingInstance {
  public:
   TestBrowsingInstance(BrowserContext* browser_context, int* delete_counter)
       : BrowsingInstance(browser_context),
         use_process_per_site_(false),
         delete_counter_(delete_counter) {
   }
 
@@ skipping 459 matching lines @@
   host.reset(instance->GetProcess());
   EXPECT_TRUE(host.get() != NULL);
   EXPECT_TRUE(instance->HasProcess());
 
   EXPECT_FALSE(instance->HasWrongProcessForURL(GURL("http://evernote.com")));
   EXPECT_FALSE(instance->HasWrongProcessForURL(
       GURL("javascript:alert(document.location.href);")));
 
   EXPECT_TRUE(instance->HasWrongProcessForURL(GURL("chrome://settings")));
 }