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 <stddef.h> | 5 #include <stddef.h> |
6 #include <stdint.h> | 6 #include <stdint.h> |
7 | 7 |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/base_switches.h" | 10 #include "base/base_switches.h" |
(...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
266 } | 266 } |
267 }; | 267 }; |
268 | 268 |
269 IN_PROC_BROWSER_TEST_F(ExtensionsLoadTest, Test) { | 269 IN_PROC_BROWSER_TEST_F(ExtensionsLoadTest, Test) { |
270 WaitForServicesToStart(1, true); | 270 WaitForServicesToStart(1, true); |
271 TestInjection(true, true); | 271 TestInjection(true, true); |
272 } | 272 } |
273 | 273 |
274 #if defined(OS_CHROMEOS) | 274 #if defined(OS_CHROMEOS) |
275 | 275 |
276 class ExtensionsLoadTestWithLoginScreenApps : public ExtensionsLoadTest { | |
277 protected: | |
278 void SetUpCommandLine(base::CommandLine* command_line) override { | |
279 ExtensionsLoadTest::SetUpCommandLine(command_line); | |
280 // TODO(emaxx): Remove this test fixture class once the | |
281 // EnableLoginScreenApps command line flag becomes on by default. | |
282 // crbug.com/576464 | |
283 command_line->AppendSwitch(switches::kEnableLoginScreenApps); | |
284 } | |
285 }; | |
286 | |
287 // Flaky test crbug.com/716727 | 276 // Flaky test crbug.com/716727 |
288 IN_PROC_BROWSER_TEST_F(ExtensionsLoadTestWithLoginScreenApps, | 277 IN_PROC_BROWSER_TEST_F(ExtensionsLoadTest, |
289 DISABLED_CommandLineExtensionsDontLoad) { | 278 DISABLED_SigninProfileCommandLineExtensionsDontLoad) { |
290 // The --load-extension command line flag should not be applied to the sign-in | 279 // The --load-extension command line flag should not be applied to the sign-in |
291 // profile. | 280 // profile. |
292 EXPECT_EQ(0, GetNonComponentEnabledExtensionCount( | 281 EXPECT_EQ(0, GetNonComponentEnabledExtensionCount( |
293 chromeos::ProfileHelper::GetSigninProfile())); | 282 chromeos::ProfileHelper::GetSigninProfile())); |
294 } | 283 } |
295 | 284 |
296 #endif // defined(OS_CHROMEOS) | 285 #endif // defined(OS_CHROMEOS) |
297 | 286 |
298 // ExtensionsLoadMultipleTest | 287 // ExtensionsLoadMultipleTest |
299 // Ensures that we can startup the browser with multiple extensions | 288 // Ensures that we can startup the browser with multiple extensions |
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
424 } else if (extension->name() == "App Test") { | 413 } else if (extension->name() == "App Test") { |
425 is_app_test_extension_enabled = true; | 414 is_app_test_extension_enabled = true; |
426 } else { | 415 } else { |
427 EXPECT_TRUE( | 416 EXPECT_TRUE( |
428 extensions::Manifest::IsComponentLocation(extension->location())); | 417 extensions::Manifest::IsComponentLocation(extension->location())); |
429 } | 418 } |
430 } | 419 } |
431 EXPECT_TRUE(is_app_dot_com_extension_enabled); | 420 EXPECT_TRUE(is_app_dot_com_extension_enabled); |
432 EXPECT_TRUE(is_app_test_extension_enabled); | 421 EXPECT_TRUE(is_app_test_extension_enabled); |
433 } | 422 } |
OLD | NEW |