Revert 96556 - Let pyauto create an attached webdriver instance to manipulate web pages.

chrome/browser/automation/testing_automation_provider.cc

 // Copyright (c) 2011 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/testing_automation_provider.h"
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 60 matching lines @@
 #include "chrome/browser/tab_contents/link_infobar_delegate.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/browser/translate/translate_infobar_delegate.h"
 #include "chrome/browser/translate/translate_tab_helper.h"
 #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog.h"
 #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog_queue.h"
 #include "chrome/browser/ui/app_modal_dialogs/js_modal_dialog.h"
 #include "chrome/browser/ui/app_modal_dialogs/native_app_modal_dialog.h"
 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper.h"
-#include "chrome/browser/ui/browser_init.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/find_bar/find_bar.h"
 #include "chrome/browser/ui/login/login_prompt.h"
 #include "chrome/browser/ui/omnibox/location_bar.h"
 #include "chrome/browser/ui/omnibox/omnibox_view.h"
 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/browser/ui/webui/ntp/shown_sections_handler.h"
 #include "chrome/common/automation_messages.h"
 #include "chrome/common/chrome_constants.h"
@@ skipping 2115 matching lines @@
   handler_map["ActivateTab"] =
       &TestingAutomationProvider::ActivateTabJSON;
   handler_map["GetAppModalDialogMessage"] =
       &TestingAutomationProvider::GetAppModalDialogMessage;
   handler_map["AcceptOrDismissAppModalDialog"] =
       &TestingAutomationProvider::AcceptOrDismissAppModalDialog;
   handler_map["GetChromeDriverAutomationVersion"] =
       &TestingAutomationProvider::GetChromeDriverAutomationVersion;
   handler_map["UpdateExtensionsNow"] =
       &TestingAutomationProvider::UpdateExtensionsNow;
-  handler_map["CreateNewAutomationProvider"] =
-      &TestingAutomationProvider::CreateNewAutomationProvider;
 #if defined(OS_CHROMEOS)
   handler_map["GetLoginInfo"] = &TestingAutomationProvider::GetLoginInfo;
   handler_map["ShowCreateAccountUI"] =
       &TestingAutomationProvider::ShowCreateAccountUI;
   handler_map["LoginAsGuest"] = &TestingAutomationProvider::LoginAsGuest;
   handler_map["Login"] = &TestingAutomationProvider::Login;
 
   handler_map["LockScreen"] = &TestingAutomationProvider::LockScreen;
   handler_map["UnlockScreen"] = &TestingAutomationProvider::UnlockScreen;
   handler_map["SignoutInScreenLocker"] =
@@ skipping 3773 matching lines @@
 }
 
 void TestingAutomationProvider::GetChromeDriverAutomationVersion(
     DictionaryValue* args,
     IPC::Message* reply_message) {
   DictionaryValue reply_dict;
   reply_dict.SetInteger("version", automation::kChromeDriverAutomationVersion);
   AutomationJSONReply(this, reply_message).SendSuccess(&reply_dict);
 }
 
-void TestingAutomationProvider::CreateNewAutomationProvider(
-    DictionaryValue* args,
-    IPC::Message* reply_message) {
-  AutomationJSONReply reply(this, reply_message);
-  std::string channel_id;
-  if (!args->GetString("channel_id", &channel_id)) {
-    reply.SendError("'channel_id' missing or invalid");
-    return;
-  }
-
-  // TODO(kkania): Remove this when crbug.com/91311 is fixed.
-  // Named server channels should ideally be created and closed on the file
-  // thread, within the IPC channel code.
-  base::ThreadRestrictions::ScopedAllowIO allow_io;
-  if (!BrowserInit::CreateAutomationProvider<TestingAutomationProvider>(
-          automation::kNamedInterfacePrefix + channel_id, profile_, 0)) {
-    reply.SendError("Failed to initialize channel: " + channel_id);
-    return;
-  }
-  reply.SendSuccess(NULL);
-}
-
 void TestingAutomationProvider::WaitForTabCountToBecome(
     int browser_handle,
     int target_tab_count,
     IPC::Message* reply_message) {
   if (!browser_tracker_->ContainsHandle(browser_handle)) {
     AutomationMsg_WaitForTabCountToBecome::WriteReplyParams(reply_message,
                                                             false);
     Send(reply_message);
     return;
   }
@@ skipping 134 matching lines @@
   IPC::ParamTraits<std::vector<GURL> >::Write(reply_message_, redirects_gurl);
 
   Send(reply_message_);
   redirect_query_ = 0;
   reply_message_ = NULL;
 }
 
 void TestingAutomationProvider::OnRemoveProvider() {
   AutomationProviderList::GetInstance()->RemoveProvider(this);
 }