Remove content dependency on chrome/browser/accessibility/browser_accessibility_state.h and chrom...

chrome/browser/browser_main.cc

Index: chrome/browser/browser_main.cc
===================================================================
--- chrome/browser/browser_main.cc	(revision 88904)
+++ chrome/browser/browser_main.cc	(working copy)
@@ -1215,6 +1215,11 @@
 int BrowserMain(const MainFunctionParams& parameters) {
   TRACE_EVENT_BEGIN_ETW("BrowserMain", 0, "");
 
+  // Override the default ContentBrowserClient to let Chrome participate in
+  // content logic.
+  chrome::ChromeContentBrowserClient browser_client;
+  content::GetContentClient()->set_browser(&browser_client);
+
   // If we're running tests (ui_task is non-null).
   if (parameters.ui_task)
     browser_defaults::enable_help_app = false;
@@ -1462,11 +1467,6 @@
   SecKeychainAddCallback(&KeychainCallback, 0, NULL);
 #endif
 
-  // Override the default ContentBrowserClient to let Chrome participate in
-  // content logic.  Must be done before any tabs or profiles are created.
-  chrome::ChromeContentBrowserClient browser_client;
-  content::GetContentClient()->set_browser(&browser_client);
-
   CreateChildThreads(browser_process.get());
 
 #if defined(OS_CHROMEOS)