diff options
author | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-06 15:18:04 +0000 |
---|---|---|
committer | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-06 15:18:04 +0000 |
commit | 7419d4b42d6be9b4b0f93c3fc4a85ca104e24821 (patch) | |
tree | 93896973bafb635a55e3595bb772356b21b405d0 /chrome_frame/cfproxy_test.cc | |
parent | e608d5644b2b4c76ffad9a7d443f338746256e8b (diff) | |
download | chromium_src-7419d4b42d6be9b4b0f93c3fc4a85ca104e24821.zip chromium_src-7419d4b42d6be9b4b0f93c3fc4a85ca104e24821.tar.gz chromium_src-7419d4b42d6be9b4b0f93c3fc4a85ca104e24821.tar.bz2 |
Remove extension automation support that was used only by CEEE.
BUG=none
TEST=all automated tests pass
Review URL: http://codereview.chromium.org/6756044
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80626 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/cfproxy_test.cc')
-rw-r--r-- | chrome_frame/cfproxy_test.cc | 26 |
1 files changed, 6 insertions, 20 deletions
diff --git a/chrome_frame/cfproxy_test.cc b/chrome_frame/cfproxy_test.cc index 30ce339..6599000 100644 --- a/chrome_frame/cfproxy_test.cc +++ b/chrome_frame/cfproxy_test.cc @@ -41,12 +41,6 @@ struct MockChromeProxyDelegate : public ChromeProxyDelegate { HWND tab_window, int tab_handle, int session_id)); MOCK_METHOD2(Completed_Navigate, void(bool success, enum AutomationMsg_NavigationResponseValues res)); - MOCK_METHOD3(Completed_InstallExtension, void(bool success, - enum AutomationMsg_ExtensionResponseValues res, SyncMessageContext* ctx)); - MOCK_METHOD3(Completed_LoadExpandedExtension, void(bool success, - enum AutomationMsg_ExtensionResponseValues res, SyncMessageContext* ctx)); - MOCK_METHOD2(Completed_GetEnabledExtensions, void(bool success, - const std::vector<FilePath>* v)); // Network requests from Chrome. MOCK_METHOD2(Network_Start, void(int request_id, @@ -343,28 +337,20 @@ TEST(SyncMsgSender, Deserialize) { const int kTabHandle = 6; const int kSessionId = 8; - // Create some sync messages and their replies. - AutomationMsg_InstallExtension m1(FilePath(L"c:\\awesome.x"), 0); - AutomationMsg_CreateExternalTab m2(ExternalTabSettings(), 0, 0, 0, 0); - scoped_ptr<IPC::Message> r1(CreateReply(&m1, - AUTOMATION_MSG_EXTENSION_INSTALL_SUCCEEDED)); - scoped_ptr<IPC::Message> r2(CreateReply(&m2, (HWND)1, (HWND)2, kTabHandle, - kSessionId)); + // Create a sync message and its reply. + AutomationMsg_CreateExternalTab m(ExternalTabSettings(), 0, 0, 0, 0); + scoped_ptr<IPC::Message> r(CreateReply(&m, (HWND)1, (HWND)2, kTabHandle, + kSessionId)); - queue.QueueSyncMessage(&m1, &d1, NULL); - queue.QueueSyncMessage(&m2, &d1, NULL); + queue.QueueSyncMessage(&m, &d1, NULL); testing::InSequence s; - EXPECT_CALL(d1, Completed_InstallExtension(true, - AUTOMATION_MSG_EXTENSION_INSTALL_SUCCEEDED, NULL)); EXPECT_CALL(d1, Completed_CreateTab(true, (HWND)1, (HWND)2, kTabHandle, kSessionId)); // Execute replies in a worker thread. ipc.message_loop()->PostTask(FROM_HERE, NewRunnableMethod(&queue, - &SyncMsgSender::OnReplyReceived, r1.get())); - ipc.message_loop()->PostTask(FROM_HERE, NewRunnableMethod(&queue, - &SyncMsgSender::OnReplyReceived, r2.get())); + &SyncMsgSender::OnReplyReceived, r.get())); ipc.Stop(); // Expect that tab 6 has been associated with the delegate. |