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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 262016: Implement chrome.extension.connectExternal and fix various API inconsistencies. (Closed)
Patch Set: addressed comments Created 11 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
« no previous file with comments | « chrome/browser/extensions/extension_messages_apitest.cc ('k') | chrome/browser/renderer_host/resource_message_filter.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) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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/extensions/extension_message_service.h" 5 #include "chrome/browser/extensions/extension_message_service.h"
6 #include "chrome/common/render_messages.h" 6 #include "chrome/common/render_messages.h"
7 #include "chrome/renderer/extensions/event_bindings.h" 7 #include "chrome/renderer/extensions/event_bindings.h"
8 #include "chrome/renderer/extensions/renderer_extension_bindings.h" 8 #include "chrome/renderer/extensions/renderer_extension_bindings.h"
9 #include "chrome/test/render_view_test.h" 9 #include "chrome/test/render_view_test.h"
10 #include "testing/gtest/include/gtest/gtest.h" 10 #include "testing/gtest/include/gtest/gtest.h"
11 11
12 static void DispatchOnConnect(int source_port_id, const std::string& name, 12 static void DispatchOnConnect(int source_port_id, const std::string& name,
13 const std::string& tab_json) { 13 const std::string& tab_json) {
14 ListValue args; 14 ListValue args;
15 args.Set(0, Value::CreateIntegerValue(source_port_id)); 15 args.Set(0, Value::CreateIntegerValue(source_port_id));
16 args.Set(1, Value::CreateStringValue(name)); 16 args.Set(1, Value::CreateStringValue(name));
17 args.Set(2, Value::CreateStringValue(tab_json)); 17 args.Set(2, Value::CreateStringValue(tab_json));
18 args.Set(3, Value::CreateStringValue("")); // extension ID is empty for tests 18 args.Set(3, Value::CreateStringValue("")); // extension ID is empty for tests
19 args.Set(4, Value::CreateStringValue("")); // extension ID is empty for tests
19 RendererExtensionBindings::Invoke( 20 RendererExtensionBindings::Invoke(
20 ExtensionMessageService::kDispatchOnConnect, args, NULL); 21 ExtensionMessageService::kDispatchOnConnect, args, NULL);
21 } 22 }
22 23
23 static void DispatchOnDisconnect(int source_port_id) { 24 static void DispatchOnDisconnect(int source_port_id) {
24 ListValue args; 25 ListValue args;
25 args.Set(0, Value::CreateIntegerValue(source_port_id)); 26 args.Set(0, Value::CreateIntegerValue(source_port_id));
26 RendererExtensionBindings::Invoke( 27 RendererExtensionBindings::Invoke(
27 ExtensionMessageService::kDispatchOnDisconnect, args, NULL); 28 ExtensionMessageService::kDispatchOnDisconnect, args, NULL);
28 } 29 }
29 30
30 static void DispatchOnMessage(const std::string& message, int source_port_id) { 31 static void DispatchOnMessage(const std::string& message, int source_port_id) {
31 ListValue args; 32 ListValue args;
32 args.Set(0, Value::CreateStringValue(message)); 33 args.Set(0, Value::CreateStringValue(message));
33 args.Set(1, Value::CreateIntegerValue(source_port_id)); 34 args.Set(1, Value::CreateIntegerValue(source_port_id));
34 RendererExtensionBindings::Invoke( 35 RendererExtensionBindings::Invoke(
35 ExtensionMessageService::kDispatchOnMessage, args, NULL); 36 ExtensionMessageService::kDispatchOnMessage, args, NULL);
36 } 37 }
37 38
38 // Tests that the bindings for opening a channel to an extension and sending 39 // Tests that the bindings for opening a channel to an extension and sending
39 // and receiving messages through that channel all works. 40 // and receiving messages through that channel all works.
40 TEST_F(RenderViewTest, ExtensionMessagesOpenChannel) { 41 TEST_F(RenderViewTest, ExtensionMessagesOpenChannel) {
41 render_thread_.sink().ClearMessages(); 42 render_thread_.sink().ClearMessages();
42 LoadHTML("<body></body>"); 43 LoadHTML("<body></body>");
43 ExecuteJavaScript( 44 ExecuteJavaScript(
44 "var e = new chrome.Extension('foobar');" 45 "var port = chrome.extension.connect({name:'testName'});"
45 "var port = e.connect({name:'testName'});"
46 "port.onMessage.addListener(doOnMessage);" 46 "port.onMessage.addListener(doOnMessage);"
47 "port.postMessage({message: 'content ready'});" 47 "port.postMessage({message: 'content ready'});"
48 "function doOnMessage(msg, port) {" 48 "function doOnMessage(msg, port) {"
49 " alert('content got: ' + msg.val);" 49 " alert('content got: ' + msg.val);"
50 "}"); 50 "}");
51 51
52 // Verify that we opened a channel and sent a message through it. 52 // Verify that we opened a channel and sent a message through it.
53 const IPC::Message* open_channel_msg = 53 const IPC::Message* open_channel_msg =
54 render_thread_.sink().GetUniqueMessageMatching( 54 render_thread_.sink().GetUniqueMessageMatching(
55 ViewHostMsg_OpenChannelToExtension::ID); 55 ViewHostMsg_OpenChannelToExtension::ID);
56 ASSERT_TRUE(open_channel_msg); 56 ASSERT_TRUE(open_channel_msg);
57 void* iter = IPC::SyncMessage::GetDataIterator(open_channel_msg); 57 void* iter = IPC::SyncMessage::GetDataIterator(open_channel_msg);
58 ViewHostMsg_OpenChannelToExtension::SendParam open_params; 58 ViewHostMsg_OpenChannelToExtension::SendParam open_params;
59 ASSERT_TRUE(IPC::ReadParam(open_channel_msg, &iter, &open_params)); 59 ASSERT_TRUE(IPC::ReadParam(open_channel_msg, &iter, &open_params));
60 EXPECT_EQ("testName", open_params.c); 60 EXPECT_EQ("testName", open_params.d);
61 61
62 const IPC::Message* post_msg = 62 const IPC::Message* post_msg =
63 render_thread_.sink().GetUniqueMessageMatching( 63 render_thread_.sink().GetUniqueMessageMatching(
64 ViewHostMsg_ExtensionPostMessage::ID); 64 ViewHostMsg_ExtensionPostMessage::ID);
65 ASSERT_TRUE(post_msg); 65 ASSERT_TRUE(post_msg);
66 ViewHostMsg_ExtensionPostMessage::Param post_params; 66 ViewHostMsg_ExtensionPostMessage::Param post_params;
67 ViewHostMsg_ExtensionPostMessage::Read(post_msg, &post_params); 67 ViewHostMsg_ExtensionPostMessage::Read(post_msg, &post_params);
68 EXPECT_EQ("{\"message\":\"content ready\"}", post_params.b); 68 EXPECT_EQ("{\"message\":\"content ready\"}", post_params.b);
69 69
70 // Now simulate getting a message back from the other side. 70 // Now simulate getting a message back from the other side.
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
209 // Disconnect the port in the top frame. 209 // Disconnect the port in the top frame.
210 render_thread_.sink().ClearMessages(); 210 render_thread_.sink().ClearMessages();
211 DispatchOnMessage("{\"disconnect\": true}", kPortId); 211 DispatchOnMessage("{\"disconnect\": true}", kPortId);
212 212
213 // Now we should have a disconnect message. 213 // Now we should have a disconnect message.
214 disconnect_msg = 214 disconnect_msg =
215 render_thread_.sink().GetUniqueMessageMatching( 215 render_thread_.sink().GetUniqueMessageMatching(
216 ViewHostMsg_ExtensionCloseChannel::ID); 216 ViewHostMsg_ExtensionCloseChannel::ID);
217 ASSERT_TRUE(disconnect_msg); 217 ASSERT_TRUE(disconnect_msg);
218 } 218 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_messages_apitest.cc ('k') | chrome/browser/renderer_host/resource_message_filter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698