Revert 31419 - Commit Issue 255057: Unit Test for Toggling of Encoding AutoDe...

chrome/browser/automation/automation_provider.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/automation/automation_provider.h"
 
 #include <set>
 
 #include "app/l10n_util.h"
 #include "app/message_box_flags.h"
@@ skipping 399 matching lines @@
                         GetShowingAppModalDialog)
     IPC_MESSAGE_HANDLER(AutomationMsg_ClickAppModalDialogButton,
                         ClickAppModalDialogButton)
     IPC_MESSAGE_HANDLER(AutomationMsg_SetStringPreference, SetStringPreference)
     IPC_MESSAGE_HANDLER(AutomationMsg_GetBooleanPreference,
                         GetBooleanPreference)
     IPC_MESSAGE_HANDLER(AutomationMsg_SetBooleanPreference,
                         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)
     IPC_MESSAGE_HANDLER(AutomationMsg_WindowTitle, GetWindowTitle)
 #if defined(OS_WIN)
     // Depends on ExternalTabContainer, so Windows-only
     IPC_MESSAGE_HANDLER(AutomationMsg_SetEnableExtensionAutomation,
                         SetEnableExtensionAutomation)
 #endif
     IPC_MESSAGE_HANDLER(AutomationMsg_SetShelfVisibility, SetShelfVisibility)
@@ skipping 1453 matching lines @@
   *success = false;
   if (browser_tracker_->ContainsHandle(handle)) {
     Browser* browser = browser_tracker_->GetResource(handle);
     browser->profile()->GetPrefs()->SetString(name.c_str(), value);
     *success = true;
   }
 }
 
 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)) {
     Browser* browser = browser_tracker_->GetResource(handle);
     *value = browser->profile()->GetPrefs()->GetBoolean(name.c_str());
     *success = true;
   }
 }
 
 void AutomationProvider::SetBooleanPreference(int handle,
@@ skipping 14 matching lines @@
   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))
       *current_encoding = nav->tab_contents()->encoding();
   }
 }
 
-// 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) {
   *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);
 
@@ skipping 266 matching lines @@
                                       reply_message);
 
     profile_->GetExtensionsService()->LoadExtension(extension_dir);
     profile_->GetUserScriptMaster()->AddWatchedPath(extension_dir);
   } else {
     AutomationMsg_LoadExpandedExtension::WriteReplyParams(
         reply_message, AUTOMATION_MSG_EXTENSION_INSTALL_FAILED);
     Send(reply_message);
   }
 }