Reverting this CL to see if this fixes chrome frame unit test failures....

chrome/browser/automation/automation_provider.cc

 // Copyright (c) 2010 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 15 matching lines @@
 #include "chrome/browser/automation/automation_extension_function.h"
 #include "chrome/browser/automation/automation_provider_list.h"
 #include "chrome/browser/automation/automation_provider_observers.h"
 #include "chrome/browser/automation/extension_automation_constants.h"
 #include "chrome/browser/automation/extension_port_container.h"
 #include "chrome/browser/blocked_popup_container.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_storage.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_window.h"
-#include "chrome/browser/browsing_data_remover.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/dom_operation_notification_details.h"
 #include "chrome/browser/debugger/devtools_manager.h"
 #include "chrome/browser/download/download_manager.h"
 #include "chrome/browser/download/download_shelf.h"
 #include "chrome/browser/extensions/crx_installer.h"
 #include "chrome/browser/extensions/extension_install_ui.h"
 #include "chrome/browser/extensions/extension_message_service.h"
 #include "chrome/browser/extensions/user_script_master.h"
 #include "chrome/browser/find_bar.h"
@@ skipping 453 matching lines @@
                                     LoginWithUserAndPass)
 #endif
 #if defined(TOOLKIT_VIEWS)
     IPC_MESSAGE_HANDLER_DELAY_REPLY(AutomationMsg_WaitForFocusedViewIDToChange,
                                     WaitForFocusedViewIDToChange)
     IPC_MESSAGE_HANDLER(AutomationMsg_StartTrackingPopupMenus,
                         StartTrackingPopupMenus)
     IPC_MESSAGE_HANDLER_DELAY_REPLY(AutomationMsg_WaitForPopupMenuToOpen,
                                     WaitForPopupMenuToOpen)
 #endif
-    IPC_MESSAGE_HANDLER(AutomationMsg_RemoveBrowsingData, RemoveBrowsingData)
   IPC_END_MESSAGE_MAP()
 }
 
 void AutomationProvider::ActivateTab(int handle, int at_index, int* status) {
   *status = -1;
   if (browser_tracker_->ContainsHandle(handle) && at_index > -1) {
     Browser* browser = browser_tracker_->GetResource(handle);
     if (at_index >= 0 && at_index < browser->tab_count()) {
       browser->SelectTabContentsAt(at_index, true);
       *status = 0;
@@ skipping 1823 matching lines @@
     NavigationController* tab = tab_tracker_->GetResource(tab_handle);
     DCHECK(tab != NULL);
     if (tab && tab->tab_contents()) {
       DCHECK(tab->tab_contents()->profile() != NULL);
       tab->tab_contents()->profile()->GetPrefs()->SetInteger(
           prefs::kWebKitDefaultFontSize, font_size);
     }
   }
 }
 
-void AutomationProvider::RemoveBrowsingData(int remove_mask) {
-  BrowsingDataRemover* remover;
-  remover = new BrowsingDataRemover(profile(),
-      BrowsingDataRemover::EVERYTHING,  // All time periods.
-      base::Time());
-  remover->Remove(remove_mask);
-  // BrowsingDataRemover deletes itself.
-}
 
 void AutomationProvider::WaitForBrowserWindowCountToBecome(
     int target_count, IPC::Message* reply_message) {
   if (static_cast<int>(BrowserList::size()) == target_count) {
     AutomationMsg_WaitForBrowserWindowCountToBecome::WriteReplyParams(
         reply_message, true);
     Send(reply_message);
     return;
   }
 
@@ skipping 189 matching lines @@
 
 void AutomationProvider::StartTrackingPopupMenus(
     int browser_handle, bool* success) {
   NOTIMPLEMENTED();
 }
 
 void AutomationProvider::WaitForPopupMenuToOpen(IPC::Message* reply_message) {
   NOTIMPLEMENTED();
 }
 #endif  // !defined(TOOLKIT_VIEWS)