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

Side by Side Diff: chrome/test/base/test_launcher_utils.cc

Issue 10806056: Move plugin_browsertests.cc from browser_tests to content_browsertests. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: sync to mac+win fixes Created 8 years, 5 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/base/in_process_browser_test.h ('k') | chrome/test/base/ui_test_utils.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) 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/test_launcher_utils.h" 5 #include "chrome/test/base/test_launcher_utils.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/environment.h" 8 #include "base/environment.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 // Disable safebrowsing autoupdate. 42 // Disable safebrowsing autoupdate.
43 command_line->AppendSwitch(switches::kSbDisableAutoUpdate); 43 command_line->AppendSwitch(switches::kSbDisableAutoUpdate);
44 44
45 // Don't install default apps. 45 // Don't install default apps.
46 command_line->AppendSwitch(switches::kDisableDefaultApps); 46 command_line->AppendSwitch(switches::kDisableDefaultApps);
47 47
48 // Don't collect GPU info, load GPU blacklist, or schedule a GPU blacklist 48 // Don't collect GPU info, load GPU blacklist, or schedule a GPU blacklist
49 // auto-update. 49 // auto-update.
50 command_line->AppendSwitch(switches::kSkipGpuDataLoading); 50 command_line->AppendSwitch(switches::kSkipGpuDataLoading);
51 51
52 // The tests assume that file:// URIs can freely access other file:// URIs.
Nirnimesh 2012/07/24 21:10:59 This has broken up all pyauto usage completely. Al
53 command_line->AppendSwitch(switches::kAllowFileAccessFromFiles);
54
55 #if defined(USE_ASH) 52 #if defined(USE_ASH)
56 // Disable window animations under Ash as the animations effect the 53 // Disable window animations under Ash as the animations effect the
57 // coordinates returned and result in flake. 54 // coordinates returned and result in flake.
58 command_line->AppendSwitch(ash::switches::kAshWindowAnimationsDisabled); 55 command_line->AppendSwitch(ash::switches::kAshWindowAnimationsDisabled);
59 #endif 56 #endif
60 57
61 #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_CHROMEOS) 58 #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_CHROMEOS)
62 // Don't use the native password stores on Linux since they may 59 // Don't use the native password stores on Linux since they may
63 // prompt for additional UI during tests and cause test failures or 60 // prompt for additional UI during tests and cause test failures or
64 // timeouts. Win, Mac and ChromeOS don't look at the kPasswordStore 61 // timeouts. Win, Mac and ChromeOS don't look at the kPasswordStore
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 const std::string& implementation_name) { 97 const std::string& implementation_name) {
101 if (command_line->HasSwitch(switches::kUseGL)) 98 if (command_line->HasSwitch(switches::kUseGL))
102 return false; 99 return false;
103 100
104 command_line->AppendSwitchASCII(switches::kUseGL, implementation_name); 101 command_line->AppendSwitchASCII(switches::kUseGL, implementation_name);
105 102
106 return true; 103 return true;
107 } 104 }
108 105
109 } // namespace test_launcher_utils 106 } // namespace test_launcher_utils
OLDNEW
« no previous file with comments | « chrome/test/base/in_process_browser_test.h ('k') | chrome/test/base/ui_test_utils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698