| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/apps/app_browsertest_util.h" | 5 #include "chrome/browser/apps/app_browsertest_util.h" |
| 6 #include "chrome/browser/extensions/api/management/management_api.h" | 6 #include "chrome/browser/extensions/api/management/management_api.h" |
| 7 #include "chrome/browser/extensions/extension_apitest.h" | 7 #include "chrome/browser/extensions/extension_apitest.h" |
| 8 #include "chrome/browser/extensions/extension_function_test_utils.h" | 8 #include "chrome/browser/extensions/extension_function_test_utils.h" |
| 9 #include "chrome/browser/extensions/test_extension_dir.h" | 9 #include "chrome/browser/extensions/test_extension_dir.h" |
| 10 #include "chrome/test/base/ui_test_utils.h" | 10 #include "chrome/test/base/ui_test_utils.h" |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 65 | 65 |
| 66 // Tests chrome.runtime.getPackageDirectory with an extension. | 66 // Tests chrome.runtime.getPackageDirectory with an extension. |
| 67 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, | 67 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, |
| 68 ChromeRuntimeGetPackageDirectoryEntryExtension) { | 68 ChromeRuntimeGetPackageDirectoryEntryExtension) { |
| 69 ASSERT_TRUE(RunExtensionTest("runtime/get_package_directory/extension")) | 69 ASSERT_TRUE(RunExtensionTest("runtime/get_package_directory/extension")) |
| 70 << message_; | 70 << message_; |
| 71 } | 71 } |
| 72 | 72 |
| 73 // Tests chrome.runtime.reload | 73 // Tests chrome.runtime.reload |
| 74 // This test is flaky: crbug.com/366181 | 74 // This test is flaky: crbug.com/366181 |
| 75 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLE_ChromeRuntimeReload) { | 75 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_ChromeRuntimeReload) { |
| 76 ExtensionRegistry* registry = ExtensionRegistry::Get(profile()); | 76 ExtensionRegistry* registry = ExtensionRegistry::Get(profile()); |
| 77 const char kManifest[] = | 77 const char kManifest[] = |
| 78 "{" | 78 "{" |
| 79 " \"name\": \"reload\"," | 79 " \"name\": \"reload\"," |
| 80 " \"version\": \"1.0\"," | 80 " \"version\": \"1.0\"," |
| 81 " \"background\": {" | 81 " \"background\": {" |
| 82 " \"scripts\": [\"background.js\"]" | 82 " \"scripts\": [\"background.js\"]" |
| 83 " }," | 83 " }," |
| 84 " \"manifest_version\": 2" | 84 " \"manifest_version\": 2" |
| 85 "}"; | 85 "}"; |
| (...skipping 27 matching lines...) Expand all Loading... |
| 113 } else { | 113 } else { |
| 114 load_observer.Wait(); | 114 load_observer.Wait(); |
| 115 WaitForExtensionViewsToLoad(); | 115 WaitForExtensionViewsToLoad(); |
| 116 } | 116 } |
| 117 } | 117 } |
| 118 ASSERT_TRUE( | 118 ASSERT_TRUE( |
| 119 registry->GetExtensionById(extension_id, ExtensionRegistry::TERMINATED)); | 119 registry->GetExtensionById(extension_id, ExtensionRegistry::TERMINATED)); |
| 120 } | 120 } |
| 121 | 121 |
| 122 } // namespace extensions | 122 } // namespace extensions |
| OLD | NEW |