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

Unified Diff: chrome/test/automation/automation_proxy_uitest.cc

Issue 4202004: Add named testing interface (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: '' Created 10 years, 1 month 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/test/automation/automation_proxy_uitest.h ('k') | chrome/test/automation/proxy_launcher.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/automation/automation_proxy_uitest.cc
===================================================================
--- chrome/test/automation/automation_proxy_uitest.cc (revision 67218)
+++ chrome/test/automation/automation_proxy_uitest.cc (working copy)
@@ -29,6 +29,7 @@
#include "chrome/test/automation/autocomplete_edit_proxy.h"
#include "chrome/test/automation/automation_proxy_uitest.h"
#include "chrome/test/automation/browser_proxy.h"
+#include "chrome/test/automation/proxy_launcher.h"
#include "chrome/test/automation/tab_proxy.h"
#include "chrome/test/automation/window_proxy.h"
#include "chrome/test/ui_test_utils.h"
@@ -47,6 +48,34 @@
using testing::StrEq;
using testing::_;
+
+// Replace the default automation proxy with our mock client.
+class ExternalTabUITestMockLauncher : public ProxyLauncher {
+ public:
+ explicit ExternalTabUITestMockLauncher(ExternalTabUITestMockClient **mock)
+ : mock_(mock) {
+ channel_id_ = AutomationProxy::GenerateChannelID();
+ }
+
+ AutomationProxy* CreateAutomationProxy(int execution_timeout) {
+ *mock_ = new ExternalTabUITestMockClient(execution_timeout);
+ (*mock_)->InitializeChannel(channel_id_, false);
+ return *mock_;
+ }
+
+ void InitializeConnection(UITestBase* ui_test_base) const {
+ ui_test_base->LaunchBrowserAndServer();
+ }
+
+ std::string PrefixedChannelID() const {
+ return channel_id_;
+ }
+
+ private:
+ ExternalTabUITestMockClient **mock_;
+ std::string channel_id_; // Channel id of automation proxy.
+};
+
class AutomationProxyTest : public UITest {
protected:
AutomationProxyTest() {
@@ -841,9 +870,9 @@
return reinterpret_cast<T**>(&p);
}
-AutomationProxy* ExternalTabUITest::CreateAutomationProxy(int exec_timeout) {
- mock_ = new ExternalTabUITestMockClient(exec_timeout);
- return mock_;
+// Replace the default automation proxy with our mock client.
+ProxyLauncher* ExternalTabUITest::CreateProxyLauncher() {
+ return new ExternalTabUITestMockLauncher(&mock_);
}
// Create with specifying a url
« no previous file with comments | « chrome/test/automation/automation_proxy_uitest.h ('k') | chrome/test/automation/proxy_launcher.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698