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

2 files changed, 5 insertions, 34 deletions

diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc
index e7984bc..8df4ae4 100644
--- a/chrome/browser/automation/automation_provider.cc
+++ b/chrome/browser/automation/automation_provider.cc
@@ -417,8 +417,6 @@ void AutomationProvider::OnMessageReceived(const IPC::Message& message) {
                         SetBooleanPreference)
     IPC_MESSAGE_HANDLER(AutomationMsg_GetPageCurrentEncoding,
                         GetPageCurrentEncoding)
-    IPC_MESSAGE_HANDLER(AutomationMsg_ToggleEncodingAutoDetect,
-                        ToggleEncodingAutoDetect)
     IPC_MESSAGE_HANDLER(AutomationMsg_OverrideEncoding, OverrideEncoding)
     IPC_MESSAGE_HANDLER(AutomationMsg_SavePackageShouldPromptUser,
                         SavePackageShouldPromptUser)
@@ -1892,8 +1890,8 @@ void AutomationProvider::SetStringPreference(int handle,
 
 void AutomationProvider::GetBooleanPreference(int handle,
                                               const std::wstring& name,
-                                              bool* value,
-                                              bool* success) {
+                                              bool* success,
+                                              bool* value) {
   *success = false;
   *value = false;
   if (browser_tracker_->ContainsHandle(handle)) {
@@ -1928,30 +1926,7 @@ void AutomationProvider::GetPageCurrentEncoding(
   }
 }
 
-// Toggles the encoding auto-detect setting.
-// While the setting is global, the tab needs to be specified as it may need
-// to be reloaded.
-void AutomationProvider::ToggleEncodingAutoDetect(int tab_handle,
-                                                  bool* success) {
-  *success = false;
-#if defined(OS_WIN)
-  if (tab_tracker_->ContainsHandle(tab_handle)) {
-    NavigationController* nav = tab_tracker_->GetResource(tab_handle);
-    Browser* browser = FindAndActivateTab(nav);
-    DCHECK(browser);
-
-    if (browser->command_updater()->IsCommandEnabled(IDC_ENCODING_MENU)) {
-      browser->ToggleEncodingAutoDetect();
-      *success = true;
-    }
-  }
-#else
-  // TODO(port): Enable when encoding-related parts of Browser are ported.
-  NOTIMPLEMENTED();
-#endif
-}
-
-// Sets the override encoding for the page in the specified tab.
+// Gets the current used encoding name of the page in the specified tab.
 void AutomationProvider::OverrideEncoding(int tab_handle,
                                           const std::string& encoding_name,
                                           bool* success) {
diff --git a/chrome/browser/automation/automation_provider.h b/chrome/browser/automation/automation_provider.h
index 6a66bd7..66e7de8 100644
--- a/chrome/browser/automation/automation_provider.h
+++ b/chrome/browser/automation/automation_provider.h
@@ -447,8 +447,8 @@ class AutomationProvider : public base::RefCounted<AutomationProvider>,
   // Gets the bool value for preference with name |name|.
   void GetBooleanPreference(int handle,
                             const std::wstring& name,
-                            bool* value,
-                            bool* success);
+                            bool* success,
+                            bool* value);
 
   // Sets the bool value for preference with name |name|.
   void SetBooleanPreference(int handle,
@@ -459,10 +459,6 @@ class AutomationProvider : public base::RefCounted<AutomationProvider>,
   // Gets the current used encoding name of the page in the specified tab.
   void GetPageCurrentEncoding(int tab_handle, std::string* current_encoding);
 
-  // Toggles the encoding auto-detect setting on the given tab
-  void ToggleEncodingAutoDetect(int tab_handle,
-                                bool* success);
-
   // Uses the specified encoding to override the encoding of the page in the
   // specified tab.
   void OverrideEncoding(int tab_handle,