Index: chrome/test/automation/automation_proxy.cc |
=================================================================== |
--- chrome/test/automation/automation_proxy.cc (revision 137438) |
+++ chrome/test/automation/automation_proxy.cc (working copy) |
@@ -262,42 +262,6 @@ |
return wait_success; |
} |
-bool AutomationProxy::GetShowingAppModalDialog(bool* showing_app_modal_dialog, |
- ui::DialogButton* button) { |
- if (!showing_app_modal_dialog || !button) { |
- NOTREACHED(); |
- return false; |
- } |
- |
- int button_int = 0; |
- |
- if (!Send(new AutomationMsg_ShowingAppModalDialog( |
- showing_app_modal_dialog, &button_int))) { |
- return false; |
- } |
- |
- *button = static_cast<ui::DialogButton>(button_int); |
- return true; |
-} |
- |
-bool AutomationProxy::ClickAppModalDialogButton(ui::DialogButton button) { |
- bool succeeded = false; |
- |
- if (!Send(new AutomationMsg_ClickAppModalDialogButton( |
- button, &succeeded))) { |
- return false; |
- } |
- |
- return succeeded; |
-} |
- |
-bool AutomationProxy::WaitForAppModalDialog() { |
- bool wait_success = false; |
- if (!Send(new AutomationMsg_WaitForAppModalDialogToBeShown(&wait_success))) |
- return false; |
- return wait_success; |
-} |
- |
bool AutomationProxy::IsURLDisplayed(GURL url) { |
int window_count; |
if (!GetBrowserWindowCount(&window_count)) |
@@ -339,13 +303,6 @@ |
return Send(new AutomationMsg_SetFilteredInet(enabled)); |
} |
-int AutomationProxy::GetFilteredInetHitCount() { |
- int hit_count; |
- if (!Send(new AutomationMsg_GetFilteredInetHitCount(&hit_count))) |
- return -1; |
- return hit_count; |
-} |
- |
bool AutomationProxy::SendProxyConfig(const std::string& new_proxy_config) { |
return Send(new AutomationMsg_SetProxyConfig(new_proxy_config)); |
} |
@@ -386,14 +343,6 @@ |
return ProxyObjectFromHandle<BrowserProxy>(handle); |
} |
-bool AutomationProxy::GetBrowserLocale(string16* locale) { |
- DCHECK(locale != NULL); |
- if (!Send(new AutomationMsg_GetBrowserLocale(locale))) |
- return false; |
- |
- return !locale->empty(); |
-} |
- |
scoped_refptr<BrowserProxy> AutomationProxy::FindTabbedBrowserWindow() { |
int handle = 0; |
if (!Send(new AutomationMsg_FindTabbedBrowserWindow(&handle))) |
@@ -402,14 +351,6 @@ |
return ProxyObjectFromHandle<BrowserProxy>(handle); |
} |
-scoped_refptr<BrowserProxy> AutomationProxy::GetLastActiveBrowserWindow() { |
- int handle = 0; |
- if (!Send(new AutomationMsg_LastActiveBrowserWindow(&handle))) |
- return NULL; |
- |
- return ProxyObjectFromHandle<BrowserProxy>(handle); |
-} |
- |
IPC::SyncChannel* AutomationProxy::channel() { |
return channel_.get(); |
} |
@@ -509,18 +450,6 @@ |
tracker_->put_channel(NULL); |
} |
-#if defined(OS_CHROMEOS) |
-bool AutomationProxy::LoginWithUserAndPass(const std::string& username, |
- const std::string& password) { |
- bool success; |
- bool sent = Send(new AutomationMsg_LoginWithUserAndPass(username, |
- password, |
- &success)); |
- // If message sending unsuccessful or test failed, return false. |
- return sent && success; |
-} |
-#endif |
- |
bool AutomationProxy::BeginTracing(const std::string& categories) { |
bool result = false; |
bool send_success = Send(new AutomationMsg_BeginTracing(categories, |