OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/test/base/in_process_browser_test.h" | 5 #include "chrome/test/base/in_process_browser_test.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/debug/stack_trace.h" | 9 #include "base/debug/stack_trace.h" |
10 #include "base/file_path.h" | 10 #include "base/file_path.h" |
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
164 command_line->AppendSwitchPath(switches::kBrowserSubprocessPath, | 164 command_line->AppendSwitchPath(switches::kBrowserSubprocessPath, |
165 subprocess_path); | 165 subprocess_path); |
166 #endif | 166 #endif |
167 | 167 |
168 // If neccessary, disable TabCloseableStateWatcher. | 168 // If neccessary, disable TabCloseableStateWatcher. |
169 if (!tab_closeable_state_watcher_enabled_) | 169 if (!tab_closeable_state_watcher_enabled_) |
170 command_line->AppendSwitch(switches::kDisableTabCloseableStateWatcher); | 170 command_line->AppendSwitch(switches::kDisableTabCloseableStateWatcher); |
171 | 171 |
172 // TODO(pkotwicz): Investigate if we can remove this switch. | 172 // TODO(pkotwicz): Investigate if we can remove this switch. |
173 command_line->AppendSwitch(switches::kDisableZeroBrowsersOpenForTests); | 173 command_line->AppendSwitch(switches::kDisableZeroBrowsersOpenForTests); |
174 | |
175 command_line->AppendSwitch(switches::kDisableUberPage); | |
176 } | 174 } |
177 | 175 |
178 bool InProcessBrowserTest::CreateUserDataDirectory() { | 176 bool InProcessBrowserTest::CreateUserDataDirectory() { |
179 CommandLine* command_line = CommandLine::ForCurrentProcess(); | 177 CommandLine* command_line = CommandLine::ForCurrentProcess(); |
180 FilePath user_data_dir = | 178 FilePath user_data_dir = |
181 command_line->GetSwitchValuePath(switches::kUserDataDir); | 179 command_line->GetSwitchValuePath(switches::kUserDataDir); |
182 if (user_data_dir.empty()) { | 180 if (user_data_dir.empty()) { |
183 if (temp_user_data_dir_.CreateUniqueTempDir() && | 181 if (temp_user_data_dir_.CreateUniqueTempDir() && |
184 temp_user_data_dir_.IsValid()) { | 182 temp_user_data_dir_.IsValid()) { |
185 user_data_dir = temp_user_data_dir_.path(); | 183 user_data_dir = temp_user_data_dir_.path(); |
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
340 if (BrowserList::size() == 0) | 338 if (BrowserList::size() == 0) |
341 return; | 339 return; |
342 | 340 |
343 // Invoke CloseAllBrowsersAndMayExit on a running message loop. | 341 // Invoke CloseAllBrowsersAndMayExit on a running message loop. |
344 // CloseAllBrowsersAndMayExit exits the message loop after everything has been | 342 // CloseAllBrowsersAndMayExit exits the message loop after everything has been |
345 // shut down properly. | 343 // shut down properly. |
346 MessageLoopForUI::current()->PostTask(FROM_HERE, | 344 MessageLoopForUI::current()->PostTask(FROM_HERE, |
347 base::Bind(&BrowserList::AttemptExit)); | 345 base::Bind(&BrowserList::AttemptExit)); |
348 ui_test_utils::RunMessageLoop(); | 346 ui_test_utils::RunMessageLoop(); |
349 } | 347 } |
OLD | NEW |