From b8f48d184700b3bcbb6f0b4d90fe3354d5e6dd96 Mon Sep 17 00:00:00 2001 From: "willchan@chromium.org" Date: Mon, 9 Nov 2009 20:14:36 +0000 Subject: Revert 31419 - Commit Issue 255057: Unit Test for Toggling of Encoding AutoDetect BUG=23617 TEST=BrowserEncodingTest.TestToggleAutoDetect TBR=rolandsteiner@chromium.org Review URL: http://codereview.chromium.org/378031 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31465 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/test/automation/automation_messages_internal.h | 9 +-------- chrome/test/automation/tab_proxy.cc | 11 +---------- chrome/test/automation/tab_proxy.h | 9 +++------ 3 files changed, 5 insertions(+), 24 deletions(-) (limited to 'chrome/test/automation') diff --git a/chrome/test/automation/automation_messages_internal.h b/chrome/test/automation/automation_messages_internal.h index db102a7..d2f7458 100644 --- a/chrome/test/automation/automation_messages_internal.h +++ b/chrome/test/automation/automation_messages_internal.h @@ -797,7 +797,7 @@ IPC_BEGIN_MESSAGES(Automation) int64 /* last navigation time */) // This messages is used to block until a new navigation occurs (if there is - // none more recent than the time specified). + // none more recent then the time specified). IPC_SYNC_MESSAGE_ROUTED2_1(AutomationMsg_WaitForNavigation, int /* tab_handle */, int64 /* last navigation time */, @@ -1184,11 +1184,4 @@ IPC_BEGIN_MESSAGES(Automation) int /* tab_handle */, int /* request_id */) - // Toggles the auto-detect encoding setting. - // While the setting is global, the tab needs to be specified as it may need - // to be reloaded. - IPC_SYNC_MESSAGE_ROUTED1_1(AutomationMsg_ToggleEncodingAutoDetect, - int /* tab handle */, - bool /* success */) - IPC_END_MESSAGES(Automation) diff --git a/chrome/test/automation/tab_proxy.cc b/chrome/test/automation/tab_proxy.cc index 875bc3a..43246ea 100644 --- a/chrome/test/automation/tab_proxy.cc +++ b/chrome/test/automation/tab_proxy.cc @@ -664,16 +664,6 @@ bool TabProxy::GetPageCurrentEncoding(std::string* encoding) { return succeeded; } -bool TabProxy::ToggleEncodingAutoDetect() { - if (!is_valid()) - return false; - - bool succeeded = false; - sender_->Send(new AutomationMsg_ToggleEncodingAutoDetect(0, handle_, - &succeeded)); - return succeeded; -} - bool TabProxy::OverrideEncoding(const std::string& encoding) { if (!is_valid()) return false; @@ -688,6 +678,7 @@ bool TabProxy::OverrideEncoding(const std::string& encoding) { void TabProxy::Reposition(HWND window, HWND window_insert_after, int left, int top, int width, int height, int flags, HWND parent_window) { + IPC::Reposition_Params params = {0}; params.window = window; params.window_insert_after = window_insert_after; diff --git a/chrome/test/automation/tab_proxy.h b/chrome/test/automation/tab_proxy.h index 0cc3f26..7693e60 100644 --- a/chrome/test/automation/tab_proxy.h +++ b/chrome/test/automation/tab_proxy.h @@ -327,9 +327,9 @@ class TabProxy : public AutomationResourceProxy { // to be used with WaitForNavigation (see below). bool GetLastNavigationTime(int64* last_navigation_time); - // Waits for a new navigation if none has occurred since - // |last_navigation_time|. The purpose of this function is for operations - // that causes asynchronous navigation to happen. + // Waits for a new navigation if none as occurred since |last_navigation_time| + // The purpose of this function is for operations that causes asynchronous + // navigation to happen. // It is supposed to be used as follow: // int64 last_nav_time; // tab_proxy->GetLastNavigationTime(&last_nav_time); @@ -340,9 +340,6 @@ class TabProxy : public AutomationResourceProxy { // Gets the current used encoding of the page in the tab. bool GetPageCurrentEncoding(std::string* encoding); - // Toggles encoding auto-detect of the page in the tab - bool ToggleEncodingAutoDetect(); - // Uses the specified encoding to override encoding of the page in the tab. bool OverrideEncoding(const std::string& encoding); -- cgit v1.1