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 <map> | 5 #include <map> |
6 | 6 |
7 #include "chrome/browser/chrome_notification_types.h" | 7 #include "chrome/browser/chrome_notification_types.h" |
8 #include "chrome/browser/extensions/api/management/management_api.h" | 8 #include "chrome/browser/extensions/api/management/management_api.h" |
9 #include "chrome/browser/extensions/extension_apitest.h" | 9 #include "chrome/browser/extensions/extension_apitest.h" |
10 #include "chrome/browser/extensions/extension_service.h" | 10 #include "chrome/browser/extensions/extension_service.h" |
(...skipping 25 matching lines...) Expand all Loading... |
36 continue; | 36 continue; |
37 found = *it; | 37 found = *it; |
38 } | 38 } |
39 return found; | 39 return found; |
40 } | 40 } |
41 | 41 |
42 } // namespace | 42 } // namespace |
43 | 43 |
44 class ExtensionManagementApiTest : public ExtensionApiTest { | 44 class ExtensionManagementApiTest : public ExtensionApiTest { |
45 public: | 45 public: |
46 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { | 46 virtual void SetUpCommandLine(CommandLine* command_line) override { |
47 ExtensionApiTest::SetUpCommandLine(command_line); | 47 ExtensionApiTest::SetUpCommandLine(command_line); |
48 command_line->AppendSwitch(switches::kEnablePanels); | 48 command_line->AppendSwitch(switches::kEnablePanels); |
49 } | 49 } |
50 | 50 |
51 virtual void LoadExtensions() { | 51 virtual void LoadExtensions() { |
52 base::FilePath basedir = test_data_dir_.AppendASCII("management"); | 52 base::FilePath basedir = test_data_dir_.AppendASCII("management"); |
53 | 53 |
54 // Load 5 enabled items. | 54 // Load 5 enabled items. |
55 LoadNamedExtension(basedir, "enabled_extension"); | 55 LoadNamedExtension(basedir, "enabled_extension"); |
56 LoadNamedExtension(basedir, "enabled_app"); | 56 LoadNamedExtension(basedir, "enabled_app"); |
(...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
328 LoadExtensions(); | 328 LoadExtensions(); |
329 base::FilePath basedir = test_data_dir_.AppendASCII("management"); | 329 base::FilePath basedir = test_data_dir_.AppendASCII("management"); |
330 LoadNamedExtension(basedir, "packaged_app"); | 330 LoadNamedExtension(basedir, "packaged_app"); |
331 | 331 |
332 ASSERT_TRUE(RunExtensionSubtest("management/test", "launchType.html")); | 332 ASSERT_TRUE(RunExtensionSubtest("management/test", "launchType.html")); |
333 } | 333 } |
334 | 334 |
335 class ExtensionManagementApiStreamlinedAppsTest | 335 class ExtensionManagementApiStreamlinedAppsTest |
336 : public ExtensionManagementApiTest { | 336 : public ExtensionManagementApiTest { |
337 public: | 337 public: |
338 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { | 338 virtual void SetUpCommandLine(CommandLine* command_line) override { |
339 ExtensionManagementApiTest::SetUpCommandLine(command_line); | 339 ExtensionManagementApiTest::SetUpCommandLine(command_line); |
340 command_line->AppendSwitch(switches::kEnableStreamlinedHostedApps); | 340 command_line->AppendSwitch(switches::kEnableStreamlinedHostedApps); |
341 } | 341 } |
342 }; | 342 }; |
343 | 343 |
344 IN_PROC_BROWSER_TEST_F(ExtensionManagementApiStreamlinedAppsTest, LaunchType) { | 344 IN_PROC_BROWSER_TEST_F(ExtensionManagementApiStreamlinedAppsTest, LaunchType) { |
345 LoadExtensions(); | 345 LoadExtensions(); |
346 base::FilePath basedir = test_data_dir_.AppendASCII("management"); | 346 base::FilePath basedir = test_data_dir_.AppendASCII("management"); |
347 LoadNamedExtension(basedir, "packaged_app"); | 347 LoadNamedExtension(basedir, "packaged_app"); |
348 | 348 |
349 ASSERT_TRUE(RunExtensionSubtest("management/test", | 349 ASSERT_TRUE(RunExtensionSubtest("management/test", |
350 "launchType.html?streamlined-hosted-apps")); | 350 "launchType.html?streamlined-hosted-apps")); |
351 } | 351 } |
OLD | NEW |