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

Side by Side Diff: chrome/browser/extensions/extension_messages_apitest.cc

Issue 1413543005: Use FrameTreeNode ID as frameId in extension APIs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: s/:/ / Created 4 years, 11 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 (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 #include <utility> 7 #include <utility>
8 8
9 #include "base/base64.h" 9 #include "base/base64.h"
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
(...skipping 21 matching lines...) Expand all
32 #include "chrome/test/base/ui_test_utils.h" 32 #include "chrome/test/base/ui_test_utils.h"
33 #include "content/public/browser/notification_registrar.h" 33 #include "content/public/browser/notification_registrar.h"
34 #include "content/public/browser/notification_service.h" 34 #include "content/public/browser/notification_service.h"
35 #include "content/public/test/browser_test_utils.h" 35 #include "content/public/test/browser_test_utils.h"
36 #include "extensions/browser/event_router.h" 36 #include "extensions/browser/event_router.h"
37 #include "extensions/browser/extension_prefs.h" 37 #include "extensions/browser/extension_prefs.h"
38 #include "extensions/browser/extension_system.h" 38 #include "extensions/browser/extension_system.h"
39 #include "extensions/common/api/runtime.h" 39 #include "extensions/common/api/runtime.h"
40 #include "extensions/common/extension_builder.h" 40 #include "extensions/common/extension_builder.h"
41 #include "extensions/common/value_builder.h" 41 #include "extensions/common/value_builder.h"
42 #include "extensions/test/extension_test_message_listener.h"
43 #include "extensions/test/result_catcher.h"
42 #include "net/cert/asn1_util.h" 44 #include "net/cert/asn1_util.h"
43 #include "net/cert/jwk_serializer.h" 45 #include "net/cert/jwk_serializer.h"
44 #include "net/dns/mock_host_resolver.h" 46 #include "net/dns/mock_host_resolver.h"
45 #include "net/ssl/channel_id_service.h" 47 #include "net/ssl/channel_id_service.h"
46 #include "net/test/embedded_test_server/embedded_test_server.h" 48 #include "net/test/embedded_test_server/embedded_test_server.h"
47 #include "net/url_request/url_request_context.h" 49 #include "net/url_request/url_request_context.h"
48 #include "net/url_request/url_request_context_getter.h" 50 #include "net/url_request/url_request_context_getter.h"
49 #include "url/gurl.h" 51 #include "url/gurl.h"
50 52
51 namespace extensions { 53 namespace extensions {
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 113
112 content::NotificationRegistrar registrar_; 114 content::NotificationRegistrar registrar_;
113 }; 115 };
114 116
115 // Tests that message passing between extensions and content scripts works. 117 // Tests that message passing between extensions and content scripts works.
116 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, Messaging) { 118 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, Messaging) {
117 ASSERT_TRUE(StartEmbeddedTestServer()); 119 ASSERT_TRUE(StartEmbeddedTestServer());
118 ASSERT_TRUE(RunExtensionTest("messaging/connect")) << message_; 120 ASSERT_TRUE(RunExtensionTest("messaging/connect")) << message_;
119 } 121 }
120 122
123 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MessagingCrash) {
124 ASSERT_TRUE(StartEmbeddedTestServer());
125 ExtensionTestMessageListener ready_to_crash("ready_to_crash", true);
126 ASSERT_TRUE(LoadExtension(
127 test_data_dir_.AppendASCII("messaging/connect_crash")));
128 ui_test_utils::NavigateToURL(
129 browser(), embedded_test_server()->GetURL("/extensions/test_file.html"));
130 content::WebContents* tab =
131 browser()->tab_strip_model()->GetActiveWebContents();
132 EXPECT_TRUE(ready_to_crash.WaitUntilSatisfied());
133
134 ResultCatcher catcher;
135 CrashTab(tab);
136 EXPECT_TRUE(catcher.GetNextResult());
137 }
138
121 // Tests that message passing from one extension to another works. 139 // Tests that message passing from one extension to another works.
122 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MessagingExternal) { 140 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MessagingExternal) {
123 ASSERT_TRUE(LoadExtension( 141 ASSERT_TRUE(LoadExtension(
124 test_data_dir_.AppendASCII("..").AppendASCII("good") 142 test_data_dir_.AppendASCII("..").AppendASCII("good")
125 .AppendASCII("Extensions") 143 .AppendASCII("Extensions")
126 .AppendASCII("bjafgdebaacbbbecmhlhpofkepfkgcpa") 144 .AppendASCII("bjafgdebaacbbbecmhlhpofkepfkgcpa")
127 .AppendASCII("1.0"))); 145 .AppendASCII("1.0")));
128 146
129 ASSERT_TRUE(RunExtensionTest("messaging/connect_external")) << message_; 147 ASSERT_TRUE(RunExtensionTest("messaging/connect_external")) << message_;
130 } 148 }
(...skipping 1075 matching lines...) Expand 10 before | Expand all | Expand 10 after
1206 ui_test_utils::NavigateToURL(browser(), chromium_org_url()); 1224 ui_test_utils::NavigateToURL(browser(), chromium_org_url());
1207 EXPECT_EQ(COULD_NOT_ESTABLISH_CONNECTION_ERROR, 1225 EXPECT_EQ(COULD_NOT_ESTABLISH_CONNECTION_ERROR,
1208 CanConnectAndSendMessagesToMainFrame(invalid.get())); 1226 CanConnectAndSendMessagesToMainFrame(invalid.get()));
1209 } 1227 }
1210 1228
1211 #endif // !defined(OS_WIN) - http://crbug.com/350517. 1229 #endif // !defined(OS_WIN) - http://crbug.com/350517.
1212 1230
1213 } // namespace 1231 } // namespace
1214 1232
1215 }; // namespace extensions 1233 }; // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698