Chromium Code Reviews| Index: chrome/test/base/in_process_browser_test.cc |
| diff --git a/chrome/test/base/in_process_browser_test.cc b/chrome/test/base/in_process_browser_test.cc |
| index a4f2126ba646946da2ed2680137c9b3119301f71..3bc719e0168541bcb9582831ee5ac21f1e597574 100644 |
| --- a/chrome/test/base/in_process_browser_test.cc |
| +++ b/chrome/test/base/in_process_browser_test.cc |
| @@ -136,11 +136,13 @@ InProcessBrowserTest::InProcessBrowserTest() |
| exit_when_last_browser_closes_(true), |
| open_about_blank_on_browser_launch_(true), |
| multi_desktop_test_(false), |
| - run_accessibility_checks_for_test_case_(false) |
| + run_accessibility_checks_for_test_case_(false), |
| + enable_component_update_(false) |
| #if defined(OS_MACOSX) |
| - , autorelease_pool_(NULL) |
| + , |
|
xhwang
2016/05/20 16:41:22
this is done by git cl format
|
| + autorelease_pool_(NULL) |
| #endif // OS_MACOSX |
| - { |
| +{ |
| #if defined(OS_MACOSX) |
| // TODO(phajdan.jr): Make browser_tests self-contained on Mac, remove this. |
| // Before we run the browser, we have to hack the path to the exe to match |
| @@ -244,7 +246,8 @@ void InProcessBrowserTest::SetUp() { |
| void InProcessBrowserTest::PrepareTestCommandLine( |
| base::CommandLine* command_line) { |
| // Propagate commandline settings from test_launcher_utils. |
| - test_launcher_utils::PrepareBrowserCommandLineForTests(command_line); |
| + test_launcher_utils::PrepareBrowserCommandLineForTests( |
| + command_line, enable_component_update_); |
| // This is a Browser test. |
| command_line->AppendSwitchASCII(switches::kTestType, kBrowserTestType); |