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 | |
288 IN_PROC_BROWSER_TEST_F(ExtensionsLoadTestWithLoginScreenApps, | 287 IN_PROC_BROWSER_TEST_F(ExtensionsLoadTestWithLoginScreenApps, |
289 DISABLED_CommandLineExtensionsDontLoad) { | 288 CommandLineExtensionsDontLoad) { |
290 // The --load-extension command line flag should not be applied to the sign-in | 289 // The --load-extension command line flag should not be applied to the sign-in |
291 // profile. | 290 // profile. |
292 EXPECT_EQ(0, GetNonComponentEnabledExtensionCount( | 291 EXPECT_EQ(0, GetNonComponentEnabledExtensionCount( |
293 chromeos::ProfileHelper::GetSigninProfile())); | 292 chromeos::ProfileHelper::GetSigninProfile())); |
294 } | 293 } |
295 | 294 |
296 #endif // defined(OS_CHROMEOS) | 295 #endif // defined(OS_CHROMEOS) |
297 | 296 |
298 // ExtensionsLoadMultipleTest | 297 // ExtensionsLoadMultipleTest |
299 // Ensures that we can startup the browser with multiple extensions | 298 // 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") { | 423 } else if (extension->name() == "App Test") { |
425 is_app_test_extension_enabled = true; | 424 is_app_test_extension_enabled = true; |
426 } else { | 425 } else { |
427 EXPECT_TRUE( | 426 EXPECT_TRUE( |
428 extensions::Manifest::IsComponentLocation(extension->location())); | 427 extensions::Manifest::IsComponentLocation(extension->location())); |
429 } | 428 } |
430 } | 429 } |
431 EXPECT_TRUE(is_app_dot_com_extension_enabled); | 430 EXPECT_TRUE(is_app_dot_com_extension_enabled); |
432 EXPECT_TRUE(is_app_test_extension_enabled); | 431 EXPECT_TRUE(is_app_test_extension_enabled); |
433 } | 432 } |
OLD | NEW |