OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/browser/extensions/extension_browsertest.h" | 5 #include "chrome/browser/extensions/extension_browsertest.h" |
6 | 6 |
7 #include <vector> | 7 #include <vector> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/file_path.h" | 10 #include "base/file_path.h" |
(...skipping 26 matching lines...) Expand all Loading... |
37 void ExtensionBrowserTest::SetUpCommandLine(CommandLine* command_line) { | 37 void ExtensionBrowserTest::SetUpCommandLine(CommandLine* command_line) { |
38 // This enables DOM automation for tab contentses. | 38 // This enables DOM automation for tab contentses. |
39 EnableDOMAutomation(); | 39 EnableDOMAutomation(); |
40 | 40 |
41 // This enables it for extension hosts. | 41 // This enables it for extension hosts. |
42 ExtensionHost::EnableDOMAutomation(); | 42 ExtensionHost::EnableDOMAutomation(); |
43 | 43 |
44 PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir_); | 44 PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir_); |
45 test_data_dir_ = test_data_dir_.AppendASCII("extensions"); | 45 test_data_dir_ = test_data_dir_.AppendASCII("extensions"); |
46 | 46 |
47 // There are a number of tests that still use toolstrips. Rather than | |
48 // selectively enabling each of them, enable toolstrips for all extension | |
49 // tests. | |
50 command_line->AppendSwitch(switches::kEnableExtensionToolstrips); | |
51 | |
52 #if defined(OS_CHROMEOS) | 47 #if defined(OS_CHROMEOS) |
53 // This makes sure that we create the Default profile first, with no | 48 // This makes sure that we create the Default profile first, with no |
54 // ExtensionsService and then the real profile with one, as we do when | 49 // ExtensionsService and then the real profile with one, as we do when |
55 // running on chromeos. | 50 // running on chromeos. |
56 command_line->AppendSwitchASCII(switches::kLoginUser, | 51 command_line->AppendSwitchASCII(switches::kLoginUser, |
57 "TestUser@gmail.com"); | 52 "TestUser@gmail.com"); |
58 command_line->AppendSwitchASCII(switches::kLoginProfile, "user"); | 53 command_line->AppendSwitchASCII(switches::kLoginProfile, "user"); |
59 command_line->AppendSwitch(switches::kNoFirstRun); | 54 command_line->AppendSwitch(switches::kNoFirstRun); |
60 #endif | 55 #endif |
61 } | 56 } |
(...skipping 287 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
349 MessageLoopForUI::current()->Quit(); | 344 MessageLoopForUI::current()->Quit(); |
350 } | 345 } |
351 break; | 346 break; |
352 } | 347 } |
353 | 348 |
354 default: | 349 default: |
355 NOTREACHED(); | 350 NOTREACHED(); |
356 break; | 351 break; |
357 } | 352 } |
358 } | 353 } |
OLD | NEW |