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

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

Issue 7634031: Let pyauto create an attached webdriver instance to manipulate web pages. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: forgot to re-add the previously added files Created 9 years, 4 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 side-by-side diff with in-line comments
Download patch
Index: chrome/test/automation/proxy_launcher.cc
diff --git a/chrome/test/automation/proxy_launcher.cc b/chrome/test/automation/proxy_launcher.cc
index 95f4d0d2b2004ff76a2eb7e7106e6056f7ede70a..c8d16a64e8142b8f8ce0643550719016791c74a4 100644
--- a/chrome/test/automation/proxy_launcher.cc
+++ b/chrome/test/automation/proxy_launcher.cc
@@ -519,17 +519,22 @@ AutomationProxy* NamedProxyLauncher::CreateAutomationProxy(
return proxy;
}
-void NamedProxyLauncher::InitializeConnection(const LaunchState& state,
+bool NamedProxyLauncher::InitializeConnection(const LaunchState& state,
bool wait_for_initial_loads) {
if (launch_browser_) {
#if defined(OS_POSIX)
// Because we are waiting on the existence of the testing file below,
// make sure there isn't one already there before browser launch.
- EXPECT_TRUE(file_util::Delete(FilePath(channel_id_), false));
+ if (!file_util::Delete(FilePath(channel_id_), false)) {
+ LOG(ERROR) << "Failed to delete " << channel_id_;
+ return false;
+ }
#endif
- // Set up IPC testing interface as a client.
- ASSERT_TRUE(LaunchBrowser(state));
+ if (!LaunchBrowser(state)) {
+ LOG(ERROR) << "Failed to LaunchBrowser";
+ return false;
+ }
}
// Wait for browser to be ready for connections.
@@ -542,9 +547,16 @@ void NamedProxyLauncher::InitializeConnection(const LaunchState& state,
break;
base::PlatformThread::Sleep(automation::kSleepTime);
}
- EXPECT_TRUE(channel_initialized);
+ if (!channel_initialized) {
+ LOG(ERROR) << "Failed to wait for testing channel presence.";
+ return false;
+ }
- ASSERT_TRUE(ConnectToRunningBrowser(wait_for_initial_loads));
+ if (!ConnectToRunningBrowser(wait_for_initial_loads)) {
+ LOG(ERROR) << "Failed to ConnectToRunningBrowser";
+ return false;
+ }
+ return true;
}
void NamedProxyLauncher::TerminateConnection() {
@@ -575,9 +587,9 @@ AutomationProxy* AnonymousProxyLauncher::CreateAutomationProxy(
return proxy;
}
-void AnonymousProxyLauncher::InitializeConnection(const LaunchState& state,
+bool AnonymousProxyLauncher::InitializeConnection(const LaunchState& state,
bool wait_for_initial_loads) {
- ASSERT_TRUE(LaunchBrowserAndServer(state, wait_for_initial_loads));
+ return LaunchBrowserAndServer(state, wait_for_initial_loads);
}
void AnonymousProxyLauncher::TerminateConnection() {

Powered by Google App Engine
This is Rietveld 408576698