Revert 68944 - Revert "Add named testing interface."

Reverting the revert of named interface CL. Followup CL which addresses Pawel's comments is up at
http://codereview.chromium.org/5967003/

http://src.chromium.org/viewvc/chrome?view=rev&revision=67300

The change has been approved conditionally,
i.e. if the outstanding review comments are handled
in a follow-up as the top priority.

Two weeks have passed, and I have not seen the follow-up.
It is risky to keep this change in the tree, as it is already
non-trivial to revert.

Conflicts:

  chrome/browser/automation/automation_provider.cc
  chrome/test/ui/named_interface_uitest.cc
  ipc/ipc_channel_posix.cc

TBR=nirnimesh

BUG=chromium-os:8512
TEST=none

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

TBR=phajdan.jr@chromium.org

BUG=chromium-os:8512
TEST=ui_tests --gtest_filter=NamedInterfaceTest.FLAKY_BasicNamedInterface

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

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

2 files changed, 17 insertions, 2 deletions

diff --git a/chrome/common/automation_constants.cc b/chrome/common/automation_constants.cc
index c253871..9480254 100644
--- a/chrome/common/automation_constants.cc
+++ b/chrome/common/automation_constants.cc
@@ -5,6 +5,7 @@
 #include "chrome/common/automation_constants.h"
 
 namespace automation {
+
 // JSON value labels for proxy settings that are passed in via
 // AutomationMsg_SetProxyConfig.
 const char kJSONProxyAutoconfig[] = "proxy.autoconfig";
@@ -12,4 +13,10 @@ const char kJSONProxyNoProxy[] = "proxy.no_proxy";
 const char kJSONProxyPacUrl[] = "proxy.pac_url";
 const char kJSONProxyBypassList[] = "proxy.bypass_list";
 const char kJSONProxyServer[] = "proxy.server";
-}
+
+// Named testing interface is used when you want to connect an
+// AutomationProxy to an already-running browser instance.
+const char kNamedInterfacePrefix[] = "NamedTestingInterface:";
+
+}  // namespace automation
+
diff --git a/chrome/common/automation_constants.h b/chrome/common/automation_constants.h
index 13b120e..6579776 100644
--- a/chrome/common/automation_constants.h
+++ b/chrome/common/automation_constants.h
@@ -7,6 +7,7 @@
 #pragma once
 
 namespace automation {
+
 // JSON value labels for proxy settings that are passed in via
 // AutomationMsg_SetProxyConfig. These are here since they are used by both
 // AutomationProvider and AutomationProxy.
@@ -16,9 +17,16 @@ extern const char kJSONProxyPacUrl[];
 extern const char kJSONProxyBypassList[];
 extern const char kJSONProxyServer[];
 
+// When passing the kTestingChannelID switch to the browser, prepend
+// this prefix to the channel id to enable the named testing interface.
+// Named testing interface is used when you want to connect an
+// AutomationProxy to an already-running browser instance.
+extern const char kNamedInterfacePrefix[];
+
 // Amount of time to wait before querying the browser.
 static const int kSleepTime = 250;
-}
+
+}  // namespace automation
 
 // Used by AutomationProxy, declared here so that other headers don't need
 // to include automation_proxy.h.