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

chrome/test/base/chrome_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 "chrome/test/base/chrome_test_suite.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/metrics/stats_table.h"
@@ skipping 85 matching lines @@
 
 class ChromeTestSuiteInitializer : public testing::EmptyTestEventListener {
  public:
   ChromeTestSuiteInitializer() {
   }
 
   virtual void OnTestStart(const testing::TestInfo& test_info) OVERRIDE {
     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();
   }
 
   virtual void OnTestEnd(const testing::TestInfo& test_info) OVERRIDE {
     if (g_browser_process) {
       delete g_browser_process;
       g_browser_process = NULL;
     }
 
     DCHECK_EQ(content_client_.get(), content::GetContentClient());
     browser_content_client_.reset();
     content_client_.reset();
-    content::SetContentClient(NULL);
+    content::Uninitialize();
 
     TearDownHostResolver();
   }
 
  private:
   void SetUpHostResolver() {
     host_resolver_proc_ = new LocalHostResolverProc;
     scoped_host_resolver_proc_.reset(
         new net::ScopedDefaultHostResolverProc(host_resolver_proc_.get()));
   }
@@ skipping 79 matching lines @@
 #if defined(OS_MACOSX)
   base::mac::SetOverrideFrameworkBundle(NULL);
 #endif
 
   base::StatsTable::set_current(NULL);
   stats_table_.reset();
   RemoveSharedMemoryFile(stats_filename_);
 
   base::TestSuite::Shutdown();
 }