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

BUG=49379
TEST=none

Review URL: http://codereview.chromium.org/7523060

TBR=hnguyen
Review URL: http://codereview.chromium.org/7629019

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96580 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 0 insertions, 33 deletions

diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc
index a40364a..354a560 100644
--- a/chrome/browser/automation/testing_automation_provider.cc
+++ b/chrome/browser/automation/testing_automation_provider.cc
@@ -78,7 +78,6 @@
 #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"
@@ -2214,8 +2213,6 @@ void TestingAutomationProvider::SendJSONRequest(int handle,
       &TestingAutomationProvider::GetChromeDriverAutomationVersion;
   handler_map["UpdateExtensionsNow"] =
       &TestingAutomationProvider::UpdateExtensionsNow;
-  handler_map["CreateNewAutomationProvider"] =
-      &TestingAutomationProvider::CreateNewAutomationProvider;
 #if defined(OS_CHROMEOS)
   handler_map["GetLoginInfo"] = &TestingAutomationProvider::GetLoginInfo;
   handler_map["ShowCreateAccountUI"] =
@@ -6009,28 +6006,6 @@ void TestingAutomationProvider::GetChromeDriverAutomationVersion(
   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,
diff --git a/chrome/browser/automation/testing_automation_provider.h b/chrome/browser/automation/testing_automation_provider.h
index fbd486c..5052447 100644
--- a/chrome/browser/automation/testing_automation_provider.h
+++ b/chrome/browser/automation/testing_automation_provider.h
@@ -1150,14 +1150,6 @@ class TestingAutomationProvider : public AutomationProvider,
   void UpdateExtensionsNow(base::DictionaryValue* args,
                            IPC::Message* reply_message);
 
-  // Creates a new |TestingAutomationProvider| that opens a server channel
-  // for the given |channel_id|.
-  // The server channel will be available for connection when this returns.
-  // Example:
-  //   input: { "channel_id": "testChannel123" }
-  void CreateNewAutomationProvider(base::DictionaryValue* args,
-                                   IPC::Message* reply_message);
-
 #if defined(OS_CHROMEOS)
   // Login.
   void GetLoginInfo(base::DictionaryValue* args, IPC::Message* reply_message);