Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(409)

Side by Side Diff: extensions/browser/api/runtime/runtime_apitest.cc

Issue 555633003: Use extensions::ResultCatcher; delete ExtensionApiTest::ResultCatcher. (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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"
11 #include "content/public/browser/notification_service.h" 11 #include "content/public/browser/notification_service.h"
12 #include "extensions/browser/api/runtime/runtime_api.h" 12 #include "extensions/browser/api/runtime/runtime_api.h"
13 #include "extensions/browser/extension_registry.h" 13 #include "extensions/browser/extension_registry.h"
14 #include "extensions/test/result_catcher.h"
14 #include "net/test/embedded_test_server/embedded_test_server.h" 15 #include "net/test/embedded_test_server/embedded_test_server.h"
15 16
16 // Tests the privileged components of chrome.runtime. 17 // Tests the privileged components of chrome.runtime.
17 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ChromeRuntimePrivileged) { 18 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ChromeRuntimePrivileged) {
18 ASSERT_TRUE(RunExtensionTest("runtime/privileged")) << message_; 19 ASSERT_TRUE(RunExtensionTest("runtime/privileged")) << message_;
19 } 20 }
20 21
21 // Tests the unprivileged components of chrome.runtime. 22 // Tests the unprivileged components of chrome.runtime.
22 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ChromeRuntimeUnprivileged) { 23 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ChromeRuntimeUnprivileged) {
23 ASSERT_TRUE(StartEmbeddedTestServer()); 24 ASSERT_TRUE(StartEmbeddedTestServer());
24 ASSERT_TRUE( 25 ASSERT_TRUE(
25 LoadExtension(test_data_dir_.AppendASCII("runtime/content_script"))); 26 LoadExtension(test_data_dir_.AppendASCII("runtime/content_script")));
26 27
27 // The content script runs on webpage.html. 28 // The content script runs on webpage.html.
28 ResultCatcher catcher; 29 extensions::ResultCatcher catcher;
29 ui_test_utils::NavigateToURL(browser(), 30 ui_test_utils::NavigateToURL(browser(),
30 embedded_test_server()->GetURL("/webpage.html")); 31 embedded_test_server()->GetURL("/webpage.html"));
31 EXPECT_TRUE(catcher.GetNextResult()) << message_; 32 EXPECT_TRUE(catcher.GetNextResult()) << message_;
32 } 33 }
33 34
34 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ChromeRuntimeUninstallURL) { 35 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ChromeRuntimeUninstallURL) {
35 // Auto-confirm the uninstall dialog. 36 // Auto-confirm the uninstall dialog.
36 extensions::ManagementUninstallFunction::SetAutoConfirmForTest(true); 37 extensions::ManagementUninstallFunction::SetAutoConfirmForTest(true);
37 ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("runtime") 38 ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("runtime")
38 .AppendASCII("uninstall_url") 39 .AppendASCII("uninstall_url")
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 } else { 114 } else {
114 load_observer.Wait(); 115 load_observer.Wait();
115 WaitForExtensionViewsToLoad(); 116 WaitForExtensionViewsToLoad();
116 } 117 }
117 } 118 }
118 ASSERT_TRUE( 119 ASSERT_TRUE(
119 registry->GetExtensionById(extension_id, ExtensionRegistry::TERMINATED)); 120 registry->GetExtensionById(extension_id, ExtensionRegistry::TERMINATED));
120 } 121 }
121 122
122 } // namespace extensions 123 } // namespace extensions
OLDNEW
« no previous file with comments | « extensions/browser/api/cast_channel/cast_channel_apitest.cc ('k') | extensions/browser/api/serial/serial_apitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698