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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 8103003: Revert 103263 - Merge 101221 - Reland 101111 - Only deliver extension messages to contexts that c... (Closed) Base URL: svn://svn.chromium.org/chrome/branches/874/src/
Patch Set: Created 9 years, 2 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/extensions/extension_message_service.cc ('k') | chrome/common/extensions/extension_messages.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "base/utf_string_conversions.h" 5 #include "base/utf_string_conversions.h"
6 #include "base/values.h" 6 #include "base/values.h"
7 #include "chrome/browser/extensions/extension_message_service.h" 7 #include "chrome/browser/extensions/extension_message_service.h"
8 #include "chrome/common/extensions/extension_messages.h" 8 #include "chrome/common/extensions/extension_messages.h"
9 #include "chrome/common/render_messages.h" 9 #include "chrome/common/render_messages.h"
10 #include "chrome/renderer/extensions/event_bindings.h" 10 #include "chrome/renderer/extensions/event_bindings.h"
11 #include "chrome/renderer/extensions/renderer_extension_bindings.h"
12 #include "chrome/test/base/render_view_test.h" 11 #include "chrome/test/base/render_view_test.h"
13 #include "content/common/view_messages.h" 12 #include "content/common/view_messages.h"
14 #include "testing/gtest/include/gtest/gtest.h" 13 #include "testing/gtest/include/gtest/gtest.h"
15 14
16 static void DispatchOnConnect(int source_port_id, const std::string& name, 15 static void DispatchOnConnect(int source_port_id, const std::string& name,
17 const std::string& tab_json) { 16 const std::string& tab_json) {
18 ListValue args; 17 ListValue args;
19 args.Set(0, Value::CreateIntegerValue(source_port_id)); 18 args.Set(0, Value::CreateIntegerValue(source_port_id));
20 args.Set(1, Value::CreateStringValue(name)); 19 args.Set(1, Value::CreateStringValue(name));
21 args.Set(2, Value::CreateStringValue(tab_json)); 20 args.Set(2, Value::CreateStringValue(tab_json));
22 // Testing extensionId. Set in EventBindings::HandleContextCreated. 21 // Testing extensionId. Set in EventBindings::HandleContextCreated.
23 // We use the same id for source & target to similute an extension "talking 22 // We use the same id for source & target to similute an extension "talking
24 // to itself". 23 // to itself".
25 args.Set(3, Value::CreateStringValue(EventBindings::kTestingExtensionId)); 24 args.Set(3, Value::CreateStringValue(EventBindings::kTestingExtensionId));
26 args.Set(4, Value::CreateStringValue(EventBindings::kTestingExtensionId)); 25 args.Set(4, Value::CreateStringValue(EventBindings::kTestingExtensionId));
27 EventBindings::CallFunction( 26 EventBindings::CallFunction(
28 "", ExtensionMessageService::kDispatchOnConnect, args, NULL, GURL()); 27 "", ExtensionMessageService::kDispatchOnConnect, args, NULL, GURL());
29 } 28 }
30 29
31 static void DispatchOnDisconnect(int source_port_id) { 30 static void DispatchOnDisconnect(int source_port_id) {
32 ListValue args; 31 ListValue args;
33 args.Set(0, Value::CreateIntegerValue(source_port_id)); 32 args.Set(0, Value::CreateIntegerValue(source_port_id));
34 EventBindings::CallFunction( 33 EventBindings::CallFunction(
35 "", ExtensionMessageService::kDispatchOnDisconnect, args, NULL, GURL()); 34 "", ExtensionMessageService::kDispatchOnDisconnect, args, NULL, GURL());
36 } 35 }
37 36
37 static void DispatchOnMessage(const std::string& message, int source_port_id) {
38 ListValue args;
39 args.Set(0, Value::CreateStringValue(message));
40 args.Set(1, Value::CreateIntegerValue(source_port_id));
41 EventBindings::CallFunction(
42 "", ExtensionMessageService::kDispatchOnMessage, args, NULL, GURL());
43 }
44
38 // Tests that the bindings for opening a channel to an extension and sending 45 // Tests that the bindings for opening a channel to an extension and sending
39 // and receiving messages through that channel all works. 46 // and receiving messages through that channel all works.
40 TEST_F(RenderViewTest, ExtensionMessagesOpenChannel) { 47 TEST_F(RenderViewTest, ExtensionMessagesOpenChannel) {
41 render_thread_.sink().ClearMessages(); 48 render_thread_.sink().ClearMessages();
42 LoadHTML("<body></body>"); 49 LoadHTML("<body></body>");
43 ExecuteJavaScript( 50 ExecuteJavaScript(
44 "var port = chrome.extension.connect({name:'testName'});" 51 "var port = chrome.extension.connect({name:'testName'});"
45 "port.onMessage.addListener(doOnMessage);" 52 "port.onMessage.addListener(doOnMessage);"
46 "port.postMessage({message: 'content ready'});" 53 "port.postMessage({message: 'content ready'});"
47 "function doOnMessage(msg, port) {" 54 "function doOnMessage(msg, port) {"
(...skipping 14 matching lines...) Expand all
62 render_thread_.sink().GetUniqueMessageMatching( 69 render_thread_.sink().GetUniqueMessageMatching(
63 ExtensionHostMsg_PostMessage::ID); 70 ExtensionHostMsg_PostMessage::ID);
64 ASSERT_TRUE(post_msg); 71 ASSERT_TRUE(post_msg);
65 ExtensionHostMsg_PostMessage::Param post_params; 72 ExtensionHostMsg_PostMessage::Param post_params;
66 ExtensionHostMsg_PostMessage::Read(post_msg, &post_params); 73 ExtensionHostMsg_PostMessage::Read(post_msg, &post_params);
67 EXPECT_EQ("{\"message\":\"content ready\"}", post_params.b); 74 EXPECT_EQ("{\"message\":\"content ready\"}", post_params.b);
68 75
69 // Now simulate getting a message back from the other side. 76 // Now simulate getting a message back from the other side.
70 render_thread_.sink().ClearMessages(); 77 render_thread_.sink().ClearMessages();
71 const int kPortId = 0; 78 const int kPortId = 0;
72 RendererExtensionBindings::DeliverMessage(kPortId, "{\"val\": 42}", NULL); 79 DispatchOnMessage("{\"val\": 42}", kPortId);
73 80
74 // Verify that we got it. 81 // Verify that we got it.
75 const IPC::Message* alert_msg = 82 const IPC::Message* alert_msg =
76 render_thread_.sink().GetUniqueMessageMatching( 83 render_thread_.sink().GetUniqueMessageMatching(
77 ViewHostMsg_RunJavaScriptMessage::ID); 84 ViewHostMsg_RunJavaScriptMessage::ID);
78 ASSERT_TRUE(alert_msg); 85 ASSERT_TRUE(alert_msg);
79 iter = IPC::SyncMessage::GetDataIterator(alert_msg); 86 iter = IPC::SyncMessage::GetDataIterator(alert_msg);
80 ViewHostMsg_RunJavaScriptMessage::SendParam alert_param; 87 ViewHostMsg_RunJavaScriptMessage::SendParam alert_param;
81 ASSERT_TRUE(IPC::ReadParam(alert_msg, &iter, &alert_param)); 88 ASSERT_TRUE(IPC::ReadParam(alert_msg, &iter, &alert_param));
82 EXPECT_EQ(ASCIIToUTF16("content got: 42"), alert_param.a); 89 EXPECT_EQ(ASCIIToUTF16("content got: 42"), alert_param.a);
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 ExtensionHostMsg_PostMessage::ID); 121 ExtensionHostMsg_PostMessage::ID);
115 ASSERT_TRUE(post_msg); 122 ASSERT_TRUE(post_msg);
116 ExtensionHostMsg_PostMessage::Param post_params; 123 ExtensionHostMsg_PostMessage::Param post_params;
117 ExtensionHostMsg_PostMessage::Read(post_msg, &post_params); 124 ExtensionHostMsg_PostMessage::Read(post_msg, &post_params);
118 std::string expected_msg = 125 std::string expected_msg =
119 "{\"message\":\"onconnect from foo://bar name " + kPortName + "\"}"; 126 "{\"message\":\"onconnect from foo://bar name " + kPortName + "\"}";
120 EXPECT_EQ(expected_msg, post_params.b); 127 EXPECT_EQ(expected_msg, post_params.b);
121 128
122 // Now simulate getting a message back from the channel opener. 129 // Now simulate getting a message back from the channel opener.
123 render_thread_.sink().ClearMessages(); 130 render_thread_.sink().ClearMessages();
124 RendererExtensionBindings::DeliverMessage(kPortId, "{\"val\": 42}", NULL); 131 DispatchOnMessage("{\"val\": 42}", kPortId);
125 132
126 // Verify that we got it. 133 // Verify that we got it.
127 const IPC::Message* alert_msg = 134 const IPC::Message* alert_msg =
128 render_thread_.sink().GetUniqueMessageMatching( 135 render_thread_.sink().GetUniqueMessageMatching(
129 ViewHostMsg_RunJavaScriptMessage::ID); 136 ViewHostMsg_RunJavaScriptMessage::ID);
130 ASSERT_TRUE(alert_msg); 137 ASSERT_TRUE(alert_msg);
131 void* iter = IPC::SyncMessage::GetDataIterator(alert_msg); 138 void* iter = IPC::SyncMessage::GetDataIterator(alert_msg);
132 ViewHostMsg_RunJavaScriptMessage::SendParam alert_param; 139 ViewHostMsg_RunJavaScriptMessage::SendParam alert_param;
133 ASSERT_TRUE(IPC::ReadParam(alert_msg, &iter, &alert_param)); 140 ASSERT_TRUE(IPC::ReadParam(alert_msg, &iter, &alert_param));
134 EXPECT_EQ(ASCIIToUTF16("got: 42"), alert_param.a); 141 EXPECT_EQ(ASCIIToUTF16("got: 42"), alert_param.a);
135 142
136 // Now simulate the channel closing. 143 // Now simulate the channel closing.
137 render_thread_.sink().ClearMessages(); 144 render_thread_.sink().ClearMessages();
138 DispatchOnDisconnect(kPortId); 145 DispatchOnDisconnect(kPortId);
139 146
140 // Verify that we got it. 147 // Verify that we got it.
141 alert_msg = 148 alert_msg =
142 render_thread_.sink().GetUniqueMessageMatching( 149 render_thread_.sink().GetUniqueMessageMatching(
143 ViewHostMsg_RunJavaScriptMessage::ID); 150 ViewHostMsg_RunJavaScriptMessage::ID);
144 ASSERT_TRUE(alert_msg); 151 ASSERT_TRUE(alert_msg);
145 iter = IPC::SyncMessage::GetDataIterator(alert_msg); 152 iter = IPC::SyncMessage::GetDataIterator(alert_msg);
146 ASSERT_TRUE(IPC::ReadParam(alert_msg, &iter, &alert_param)); 153 ASSERT_TRUE(IPC::ReadParam(alert_msg, &iter, &alert_param));
147 EXPECT_EQ(ASCIIToUTF16("disconnected: 24"), alert_param.a); 154 EXPECT_EQ(ASCIIToUTF16("disconnected: 24"), alert_param.a);
148 } 155 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_message_service.cc ('k') | chrome/common/extensions/extension_messages.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698