Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(78)

Side by Side Diff: chrome/test/ui/ui_test.cc

Issue 28347: Don't expose --single-process and --in-process-plugins for official Chrome re... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/test/ui/ui_test.h ('k') | chrome/test/ui/ui_test_suite.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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/ui/ui_test.h" 5 #include "chrome/test/ui/ui_test.h"
6 6
7 #include <set> 7 #include <set>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/base_switches.h" 10 #include "base/base_switches.h"
(...skipping 30 matching lines...) Expand all
41 static const int kWaitForActionMsec = 2000; 41 static const int kWaitForActionMsec = 2000;
42 static const int kWaitForActionMaxMsec = 10000; 42 static const int kWaitForActionMaxMsec = 10000;
43 // Delay to let the browser complete the test. 43 // Delay to let the browser complete the test.
44 static const int kMaxTestExecutionTime = 30000; 44 static const int kMaxTestExecutionTime = 30000;
45 45
46 const wchar_t UITest::kFailedNoCrashService[] = 46 const wchar_t UITest::kFailedNoCrashService[] =
47 L"NOTE: This test is expected to fail if crash_service.exe is not " 47 L"NOTE: This test is expected to fail if crash_service.exe is not "
48 L"running. Start it manually before running this test (see the build " 48 L"running. Start it manually before running this test (see the build "
49 L"output directory)."; 49 L"output directory).";
50 bool UITest::in_process_renderer_ = false; 50 bool UITest::in_process_renderer_ = false;
51 bool UITest::in_process_plugins_ = false;
52 bool UITest::no_sandbox_ = false; 51 bool UITest::no_sandbox_ = false;
53 bool UITest::full_memory_dump_ = false; 52 bool UITest::full_memory_dump_ = false;
54 bool UITest::safe_plugins_ = false; 53 bool UITest::safe_plugins_ = false;
55 bool UITest::show_error_dialogs_ = true; 54 bool UITest::show_error_dialogs_ = true;
56 bool UITest::default_use_existing_browser_ = false; 55 bool UITest::default_use_existing_browser_ = false;
57 bool UITest::dump_histograms_on_exit_ = false; 56 bool UITest::dump_histograms_on_exit_ = false;
58 bool UITest::enable_dcheck_ = false; 57 bool UITest::enable_dcheck_ = false;
59 bool UITest::silent_dump_on_dcheck_ = false; 58 bool UITest::silent_dump_on_dcheck_ = false;
60 bool UITest::disable_breakpad_ = false; 59 bool UITest::disable_breakpad_ = false;
61 int UITest::timeout_ms_ = 20 * 60 * 1000; 60 int UITest::timeout_ms_ = 20 * 60 * 1000;
(...skipping 223 matching lines...) Expand 10 before | Expand all | Expand 10 after
285 // TODO(port): depends on AutomationProxy. 284 // TODO(port): depends on AutomationProxy.
286 NOTIMPLEMENTED(); 285 NOTIMPLEMENTED();
287 #endif 286 #endif
288 287
289 if (!show_error_dialogs_ && 288 if (!show_error_dialogs_ &&
290 !CommandLine::ForCurrentProcess()->HasSwitch(kEnableErrorDialogs)) { 289 !CommandLine::ForCurrentProcess()->HasSwitch(kEnableErrorDialogs)) {
291 command_line.AppendSwitch(switches::kNoErrorDialogs); 290 command_line.AppendSwitch(switches::kNoErrorDialogs);
292 } 291 }
293 if (in_process_renderer_) 292 if (in_process_renderer_)
294 command_line.AppendSwitch(switches::kSingleProcess); 293 command_line.AppendSwitch(switches::kSingleProcess);
295 if (in_process_plugins_)
296 command_line.AppendSwitch(switches::kInProcessPlugins);
297 if (no_sandbox_) 294 if (no_sandbox_)
298 command_line.AppendSwitch(switches::kNoSandbox); 295 command_line.AppendSwitch(switches::kNoSandbox);
299 if (full_memory_dump_) 296 if (full_memory_dump_)
300 command_line.AppendSwitch(switches::kFullMemoryCrashReport); 297 command_line.AppendSwitch(switches::kFullMemoryCrashReport);
301 if (safe_plugins_) 298 if (safe_plugins_)
302 command_line.AppendSwitch(switches::kSafePlugins); 299 command_line.AppendSwitch(switches::kSafePlugins);
303 if (enable_dcheck_) 300 if (enable_dcheck_)
304 command_line.AppendSwitch(switches::kEnableDCHECK); 301 command_line.AppendSwitch(switches::kEnableDCHECK);
305 if (silent_dump_on_dcheck_) 302 if (silent_dump_on_dcheck_)
306 command_line.AppendSwitch(switches::kSilentDumpOnDCHECK); 303 command_line.AppendSwitch(switches::kSilentDumpOnDCHECK);
(...skipping 498 matching lines...) Expand 10 before | Expand all | Expand 10 after
805 // <*>RESULT <graph_name>: <trace_name>= <value> <units> 802 // <*>RESULT <graph_name>: <trace_name>= <value> <units>
806 // <*>RESULT <graph_name>: <trace_name>= {<mean>, <std deviation>} <units> 803 // <*>RESULT <graph_name>: <trace_name>= {<mean>, <std deviation>} <units>
807 // <*>RESULT <graph_name>: <trace_name>= [<value>,value,value,...,] <units> 804 // <*>RESULT <graph_name>: <trace_name>= [<value>,value,value,...,] <units>
808 wprintf(L"%lsRESULT %ls%ls: %ls= %ls%ls%ls %ls\n", 805 wprintf(L"%lsRESULT %ls%ls: %ls= %ls%ls%ls %ls\n",
809 important ? L"*" : L"", measurement.c_str(), modifier.c_str(), 806 important ? L"*" : L"", measurement.c_str(), modifier.c_str(),
810 trace.c_str(), prefix.c_str(), values.c_str(), suffix.c_str(), 807 trace.c_str(), prefix.c_str(), values.c_str(), suffix.c_str(),
811 units.c_str()); 808 units.c_str());
812 } 809 }
813 810
814 #endif // OS_WIN 811 #endif // OS_WIN
OLDNEW
« no previous file with comments | « chrome/test/ui/ui_test.h ('k') | chrome/test/ui/ui_test_suite.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698