| 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 266 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 277 protected: | 277 protected: |
| 278 void SetUpCommandLine(base::CommandLine* command_line) override { | 278 void SetUpCommandLine(base::CommandLine* command_line) override { |
| 279 ExtensionsLoadTest::SetUpCommandLine(command_line); | 279 ExtensionsLoadTest::SetUpCommandLine(command_line); |
| 280 // TODO(emaxx): Remove this test fixture class once the | 280 // TODO(emaxx): Remove this test fixture class once the |
| 281 // EnableLoginScreenApps command line flag becomes on by default. | 281 // EnableLoginScreenApps command line flag becomes on by default. |
| 282 // crbug.com/576464 | 282 // crbug.com/576464 |
| 283 command_line->AppendSwitch(switches::kEnableLoginScreenApps); | 283 command_line->AppendSwitch(switches::kEnableLoginScreenApps); |
| 284 } | 284 } |
| 285 }; | 285 }; |
| 286 | 286 |
| 287 // Flaky test crbug.com/716727 |
| 287 IN_PROC_BROWSER_TEST_F(ExtensionsLoadTestWithLoginScreenApps, | 288 IN_PROC_BROWSER_TEST_F(ExtensionsLoadTestWithLoginScreenApps, |
| 288 CommandLineExtensionsDontLoad) { | 289 DISABLED_CommandLineExtensionsDontLoad) { |
| 289 // The --load-extension command line flag should not be applied to the sign-in | 290 // The --load-extension command line flag should not be applied to the sign-in |
| 290 // profile. | 291 // profile. |
| 291 EXPECT_EQ(0, GetNonComponentEnabledExtensionCount( | 292 EXPECT_EQ(0, GetNonComponentEnabledExtensionCount( |
| 292 chromeos::ProfileHelper::GetSigninProfile())); | 293 chromeos::ProfileHelper::GetSigninProfile())); |
| 293 } | 294 } |
| 294 | 295 |
| 295 #endif // defined(OS_CHROMEOS) | 296 #endif // defined(OS_CHROMEOS) |
| 296 | 297 |
| 297 // ExtensionsLoadMultipleTest | 298 // ExtensionsLoadMultipleTest |
| 298 // Ensures that we can startup the browser with multiple extensions | 299 // Ensures that we can startup the browser with multiple extensions |
| (...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 423 } else if (extension->name() == "App Test") { | 424 } else if (extension->name() == "App Test") { |
| 424 is_app_test_extension_enabled = true; | 425 is_app_test_extension_enabled = true; |
| 425 } else { | 426 } else { |
| 426 EXPECT_TRUE( | 427 EXPECT_TRUE( |
| 427 extensions::Manifest::IsComponentLocation(extension->location())); | 428 extensions::Manifest::IsComponentLocation(extension->location())); |
| 428 } | 429 } |
| 429 } | 430 } |
| 430 EXPECT_TRUE(is_app_dot_com_extension_enabled); | 431 EXPECT_TRUE(is_app_dot_com_extension_enabled); |
| 431 EXPECT_TRUE(is_app_test_extension_enabled); | 432 EXPECT_TRUE(is_app_test_extension_enabled); |
| 432 } | 433 } |
| OLD | NEW |