Make HelpApp component extension.

chrome/browser/browser_main.cc

Index: chrome/browser/browser_main.cc
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc
index 38e9d337971a565056a5dcc3ee3f5f28a554ff1c..067101e28989c7f45cbd544350987c2079b283be 100644
--- a/chrome/browser/browser_main.cc
+++ b/chrome/browser/browser_main.cc
@@ -32,6 +32,7 @@
 #include "build/build_config.h"
 #include "chrome/browser/about_flags.h"
 #include "chrome/browser/browser_main_win.h"
+#include "chrome/browser/defaults.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_process_impl.h"
 #include "chrome/browser/browser_shutdown.h"
@@ -1060,6 +1061,11 @@ bool IsMetricsReportingEnabled(const PrefService* local_state) {
 // Main routine for running as the Browser process.
 int BrowserMain(const MainFunctionParams& parameters) {
   TRACE_EVENT_BEGIN("BrowserMain", 0, "");
+
+  // If we're running tests (ui_task is non-null).
+  if (parameters.ui_task)

[Aaron Boodman, 2011/01/24 19:45:58]

You already know how I feel about doing things differently in tests :|.

+    browser_defaults::enable_help_app = false;
+
   scoped_ptr<BrowserMainParts>
       parts(BrowserMainParts::CreateBrowserMainParts(parameters));