| OLD | NEW |
| 1 // Copyright (c) 2010 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 "chrome_frame/external_tab.h" | 5 #include "chrome_frame/external_tab.h" |
| 6 #include "base/task.h" | 6 #include "base/task.h" |
| 7 #include "base/threading/thread.h" | 7 #include "base/threading/thread.h" |
| 8 #include "base/tracked.h" | 8 #include "base/tracked.h" |
| 9 | 9 |
| 10 // #include "base/synchronization/waitable_event.h" | 10 // #include "base/synchronization/waitable_event.h" |
| 11 | 11 |
| (...skipping 17 matching lines...) Expand all Loading... |
| 29 using testing::CreateFunctor; | 29 using testing::CreateFunctor; |
| 30 using testing::Return; | 30 using testing::Return; |
| 31 using testing::DoAll; | 31 using testing::DoAll; |
| 32 using testing::Field; | 32 using testing::Field; |
| 33 using chrome_frame_test::TimedMsgLoop; | 33 using chrome_frame_test::TimedMsgLoop; |
| 34 | 34 |
| 35 struct MockUIDelegate : public UIDelegate { | 35 struct MockUIDelegate : public UIDelegate { |
| 36 MOCK_METHOD2(OnNavigationStateChanged, void(int flags, | 36 MOCK_METHOD2(OnNavigationStateChanged, void(int flags, |
| 37 const NavigationInfo& nav_info)); | 37 const NavigationInfo& nav_info)); |
| 38 MOCK_METHOD1(OnUpdateTargetUrl, void(const std::wstring& new_target_url)); | 38 MOCK_METHOD1(OnUpdateTargetUrl, void(const std::wstring& new_target_url)); |
| 39 MOCK_METHOD3(OnExtensionInstalled, void(const FilePath& path, void* user_data, | |
| 40 AutomationMsg_ExtensionResponseValues response)); | |
| 41 MOCK_METHOD1(OnLoad, void(const GURL& url)); | 39 MOCK_METHOD1(OnLoad, void(const GURL& url)); |
| 42 MOCK_METHOD1(OnMoveWindow, void(const gfx::Rect& pos)); | 40 MOCK_METHOD1(OnMoveWindow, void(const gfx::Rect& pos)); |
| 43 MOCK_METHOD3(OnMessageFromChromeFrame, void(const std::string& message, | 41 MOCK_METHOD3(OnMessageFromChromeFrame, void(const std::string& message, |
| 44 const std::string& origin, const std::string& target)); | 42 const std::string& origin, const std::string& target)); |
| 45 MOCK_METHOD3(OnHandleContextMenu, void(HANDLE menu_handle, int align_flags, | 43 MOCK_METHOD3(OnHandleContextMenu, void(HANDLE menu_handle, int align_flags, |
| 46 const MiniContextMenuParams& params)); | 44 const MiniContextMenuParams& params)); |
| 47 MOCK_METHOD1(OnHandleAccelerator, void(const MSG& accel_message)); | 45 MOCK_METHOD1(OnHandleAccelerator, void(const MSG& accel_message)); |
| 48 MOCK_METHOD1(OnTabbedOut, void(bool reverse)); | 46 MOCK_METHOD1(OnTabbedOut, void(bool reverse)); |
| 49 MOCK_METHOD1(OnGoToHistoryOffset, void(int offset)); | 47 MOCK_METHOD1(OnGoToHistoryOffset, void(int offset)); |
| 50 MOCK_METHOD3(OnOpenURL, void(const GURL& url_to_open, const GURL& referrer, | 48 MOCK_METHOD3(OnOpenURL, void(const GURL& url_to_open, const GURL& referrer, |
| 51 int open_disposition)); | 49 int open_disposition)); |
| 52 }; | 50 }; |
| 53 | 51 |
| 54 struct MockProxy : public ChromeProxy { | 52 struct MockProxy : public ChromeProxy { |
| 55 MOCK_METHOD1(RemoveBrowsingData, void(int remove_mask)); | 53 MOCK_METHOD1(RemoveBrowsingData, void(int remove_mask)); |
| 56 MOCK_METHOD3(InstallExtension, void(ChromeProxyDelegate* delegate, | |
| 57 const FilePath& crx_path, SyncMessageContext* ctx)); | |
| 58 MOCK_METHOD3(LoadExtension, void(ChromeProxyDelegate* delegate, | |
| 59 const FilePath& path, SyncMessageContext* ctx)); | |
| 60 MOCK_METHOD2(GetEnabledExtensions, void(ChromeProxyDelegate* delegate, | |
| 61 SyncMessageContext* ctx)); | |
| 62 MOCK_METHOD1(SetProxyConfig, void(const std::string& json_encoded_settings)); | 54 MOCK_METHOD1(SetProxyConfig, void(const std::string& json_encoded_settings)); |
| 63 | 55 |
| 64 MOCK_METHOD2(CreateTab, void(ChromeProxyDelegate* delegate, | 56 MOCK_METHOD2(CreateTab, void(ChromeProxyDelegate* delegate, |
| 65 const ExternalTabSettings& settings)); | 57 const ExternalTabSettings& settings)); |
| 66 MOCK_METHOD3(ConnectTab, void(ChromeProxyDelegate* delegate, HWND hwnd, | 58 MOCK_METHOD3(ConnectTab, void(ChromeProxyDelegate* delegate, HWND hwnd, |
| 67 uint64 cookie)); | 59 uint64 cookie)); |
| 68 MOCK_METHOD1(BlockTab, void(uint64 cookie)); | 60 MOCK_METHOD1(BlockTab, void(uint64 cookie)); |
| 69 | 61 |
| 70 MOCK_METHOD4(Tab_PostMessage, void(int tab, const std::string& message, | 62 MOCK_METHOD4(Tab_PostMessage, void(int tab, const std::string& message, |
| 71 const std::string& origin, const std::string& target)); | 63 const std::string& origin, const std::string& target)); |
| (...skipping 13 matching lines...) Expand all Loading... |
| 85 MOCK_METHOD2(Tab_FontSize, void(int tab, AutomationPageFontSize font_size)); | 77 MOCK_METHOD2(Tab_FontSize, void(int tab, AutomationPageFontSize font_size)); |
| 86 MOCK_METHOD3(Tab_SetInitialFocus, void(int tab, bool reverse, | 78 MOCK_METHOD3(Tab_SetInitialFocus, void(int tab, bool reverse, |
| 87 bool restore_focus_to_view)); | 79 bool restore_focus_to_view)); |
| 88 MOCK_METHOD1(Tab_SetParentWindow, void(int tab)); | 80 MOCK_METHOD1(Tab_SetParentWindow, void(int tab)); |
| 89 MOCK_METHOD1(Tab_Resize, void(int tab)); | 81 MOCK_METHOD1(Tab_Resize, void(int tab)); |
| 90 MOCK_METHOD2(Tab_ProcessAccelerator, void(int tab, const MSG& msg)); | 82 MOCK_METHOD2(Tab_ProcessAccelerator, void(int tab, const MSG& msg)); |
| 91 | 83 |
| 92 // Misc. | 84 // Misc. |
| 93 MOCK_METHOD1(Tab_OnHostMoved, void(int tab)); | 85 MOCK_METHOD1(Tab_OnHostMoved, void(int tab)); |
| 94 MOCK_METHOD1(Tab_RunUnloadHandlers, void(int tab)); | 86 MOCK_METHOD1(Tab_RunUnloadHandlers, void(int tab)); |
| 95 MOCK_METHOD2(Tab_SetEnableExtensionAutomation, void(int tab, | |
| 96 const std::vector<std::string>& functions_enabled)); | |
| 97 MOCK_METHOD3(Tab_Navigate, void(int tab, const GURL& url, | 87 MOCK_METHOD3(Tab_Navigate, void(int tab, const GURL& url, |
| 98 const GURL& referrer)); | 88 const GURL& referrer)); |
| 99 MOCK_METHOD2(Tab_OverrideEncoding, void(int tab, const char* encoding)); | 89 MOCK_METHOD2(Tab_OverrideEncoding, void(int tab, const char* encoding)); |
| 100 | 90 |
| 101 MOCK_METHOD1(Init, void(const ProxyParams& params)); | 91 MOCK_METHOD1(Init, void(const ProxyParams& params)); |
| 102 MOCK_METHOD1(AddDelegate, int(ChromeProxyDelegate* delegate)); | 92 MOCK_METHOD1(AddDelegate, int(ChromeProxyDelegate* delegate)); |
| 103 MOCK_METHOD1(RemoveDelegate, int(ChromeProxyDelegate* delegate)); | 93 MOCK_METHOD1(RemoveDelegate, int(ChromeProxyDelegate* delegate)); |
| 104 }; | 94 }; |
| 105 | 95 |
| 106 struct MockFactory : public ChromeProxyFactory { | 96 struct MockFactory : public ChromeProxyFactory { |
| (...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 180 CreateTabParams tab_params; | 170 CreateTabParams tab_params; |
| 181 tab_params.is_incognito = true; | 171 tab_params.is_incognito = true; |
| 182 tab_params.is_widget_mode = false; | 172 tab_params.is_widget_mode = false; |
| 183 tab_params.url = GURL("http://Xanadu.org"); | 173 tab_params.url = GURL("http://Xanadu.org"); |
| 184 | 174 |
| 185 tab->CreateTab(tab_params, &ui_delegate); | 175 tab->CreateTab(tab_params, &ui_delegate); |
| 186 loop.RunFor(5); | 176 loop.RunFor(5); |
| 187 EXPECT_FALSE(loop.WasTimedOut()); | 177 EXPECT_FALSE(loop.WasTimedOut()); |
| 188 tab.reset(); | 178 tab.reset(); |
| 189 } | 179 } |
| OLD | NEW |