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

chrome/test/base/chrome_test_suite.cc

Index: chrome/test/base/chrome_test_suite.cc
diff --git a/chrome/test/base/chrome_test_suite.cc b/chrome/test/base/chrome_test_suite.cc
index 7adad99aed368fbb9b87b5a06a2d84e647d162a7..64024ce6f869f2a74af68af1885fa6a50ea0d9d8 100644
--- a/chrome/test/base/chrome_test_suite.cc
+++ b/chrome/test/base/chrome_test_suite.cc
@@ -103,11 +103,12 @@ class ChromeTestSuiteInitializer : public testing::EmptyTestEventListener {
     DCHECK(!g_browser_process);
     g_browser_process = new TestingBrowserProcess;
 
-    DCHECK(!content::GetContentClient());
     content_client_.reset(new chrome::ChromeContentClient);
     browser_content_client_.reset(new chrome::ChromeContentBrowserClient());
     content_client_->set_browser(browser_content_client_.get());
-    content::SetContentClient(content_client_.get());
+    // NOTE: this means we're no longer using the "offical" UA string for these
+    // tests -- is that an issue?
+    content::Initialize(content_client_.get(), "ChromeTestSuite");

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

FYI

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

It "shouldn't" be an issue, but it may be that there are tests somewhere that
depend on the string being used. I *think* I changed things so that we only
cared that the UA was non-null and/or non-empty.

 
     SetUpHostResolver();
   }
@@ -121,7 +122,7 @@ class ChromeTestSuiteInitializer : public testing::EmptyTestEventListener {
     DCHECK_EQ(content_client_.get(), content::GetContentClient());
     browser_content_client_.reset();
     content_client_.reset();
-    content::SetContentClient(NULL);
+    content::Uninitialize();
 
     TearDownHostResolver();
   }