Index: chrome/browser/browser_main.cc |
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc |
index c3a62a3beadc536e155f3981ab27b7d47d3c0975..c72fa14952a951fc75411d4bc31b6651afd73d24 100644 |
--- a/chrome/browser/browser_main.cc |
+++ b/chrome/browser/browser_main.cc |
@@ -31,6 +31,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" |
@@ -1061,6 +1062,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) |
+ browser_defaults::enable_help_app = false; |
+ |
scoped_ptr<BrowserMainParts> |
parts(BrowserMainParts::CreateBrowserMainParts(parameters)); |