| 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/extension_apitest.h" | 6 #include "chrome/browser/extensions/extension_apitest.h" |
| 7 #include "chrome/browser/extensions/extension_function_test_utils.h" | 7 #include "chrome/browser/extensions/extension_function_test_utils.h" |
| 8 #include "chrome/browser/extensions/test_extension_dir.h" | 8 #include "chrome/browser/extensions/test_extension_dir.h" |
| 9 #include "chrome/test/base/ui_test_utils.h" | 9 #include "chrome/test/base/ui_test_utils.h" |
| 10 #include "content/public/browser/notification_service.h" | 10 #include "content/public/browser/notification_service.h" |
| 11 #include "extensions/browser/api/runtime/runtime_api.h" | 11 #include "extensions/browser/api/runtime/runtime_api.h" |
| 12 #include "extensions/browser/extension_dialog_auto_confirm.h" | 12 #include "extensions/browser/extension_dialog_auto_confirm.h" |
| 13 #include "extensions/browser/extension_registry.h" | 13 #include "extensions/browser/extension_registry.h" |
| 14 #include "extensions/browser/notification_types.h" |
| 14 #include "extensions/test/result_catcher.h" | 15 #include "extensions/test/result_catcher.h" |
| 15 #include "net/test/embedded_test_server/embedded_test_server.h" | 16 #include "net/test/embedded_test_server/embedded_test_server.h" |
| 16 | 17 |
| 17 // Tests the privileged components of chrome.runtime. | 18 // Tests the privileged components of chrome.runtime. |
| 18 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ChromeRuntimePrivileged) { | 19 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ChromeRuntimePrivileged) { |
| 19 ASSERT_TRUE(RunExtensionTest("runtime/privileged")) << message_; | 20 ASSERT_TRUE(RunExtensionTest("runtime/privileged")) << message_; |
| 20 } | 21 } |
| 21 | 22 |
| 22 // Tests the unprivileged components of chrome.runtime. | 23 // Tests the unprivileged components of chrome.runtime. |
| 23 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ChromeRuntimeUnprivileged) { | 24 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ChromeRuntimeUnprivileged) { |
| (...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 122 } else { | 123 } else { |
| 123 load_observer.Wait(); | 124 load_observer.Wait(); |
| 124 WaitForExtensionViewsToLoad(); | 125 WaitForExtensionViewsToLoad(); |
| 125 } | 126 } |
| 126 } | 127 } |
| 127 ASSERT_TRUE( | 128 ASSERT_TRUE( |
| 128 registry->GetExtensionById(extension_id, ExtensionRegistry::TERMINATED)); | 129 registry->GetExtensionById(extension_id, ExtensionRegistry::TERMINATED)); |
| 129 } | 130 } |
| 130 | 131 |
| 131 } // namespace extensions | 132 } // namespace extensions |
| OLD | NEW |