Revert 68944 - Revert "Add named testing interface."

chrome/test/automation/automation_proxy.h

 // 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.
 
 #ifndef CHROME_TEST_AUTOMATION_AUTOMATION_PROXY_H__
 #define CHROME_TEST_AUTOMATION_AUTOMATION_PROXY_H__
 #pragma once
 
 #include <string>
 #include <vector>
@@ skipping 43 matching lines @@
 };
 
 // This is the interface that external processes can use to interact with
 // a running instance of the app.
 class AutomationProxy : public IPC::Channel::Listener,
                         public AutomationMessageSender {
  public:
   AutomationProxy(int command_execution_timeout_ms, bool disconnect_on_failure);
   virtual ~AutomationProxy();
 
+  // Creates a previously unused channel id.
+  static std::string GenerateChannelID();
+
+  // Initializes a channel for a connection to an AutomationProvider.
+  // If use_named_interface is false, it will act as a client
+  // and connect to the named IPC socket with channel_id as its path.
+  // If use_named_interface is true, it will act as a server and
+  // use an anonymous socketpair instead.
+  void InitializeChannel(const std::string& channel_id,
+                         bool use_named_interface);
+
   // IPC callback
   virtual void OnMessageReceived(const IPC::Message& msg);
   virtual void OnChannelError();
 
   // Close the automation IPC channel.
   void Disconnect();
 
   // Waits for the app to launch and the automation provider to say hello
   // (the app isn't fully done loading by this point).
   // Returns SUCCESS if the launch is successful.
@@ skipping 127 matching lines @@
   // Resets to the default theme. Returns true on success.
   bool ResetToDefaultTheme();
 
 #if defined(OS_CHROMEOS)
   // Logs in through the Chrome OS login wizard with given |username|
   // and |password|.  Returns true on success.
   bool LoginWithUserAndPass(const std::string& username,
                             const std::string& password) WARN_UNUSED_RESULT;
 #endif
 
-  // Returns the ID of the automation IPC channel, so that it can be
-  // passed to the app as a launch parameter.
-  const std::string& channel_id() const { return channel_id_; }
-
 #if defined(OS_POSIX)
   base::file_handle_mapping_vector fds_to_map() const;
 #endif
 
   // AutomationMessageSender implementation.
   virtual bool Send(IPC::Message* message) WARN_UNUSED_RESULT;
 
   // Wrapper over AutomationHandleTracker::InvalidateHandle. Receives the
   // message from AutomationProxy, unpacks the messages and routes that call to
   // the tracker.
@@ skipping 31 matching lines @@
   void set_perform_version_check(bool perform_version_check) {
     perform_version_check_ = perform_version_check;
   }
 
   // These functions set and reset the IPC::Channel pointer on the tracker.
   void SetChannel(IPC::Channel* channel);
   void ResetChannel();
 
  protected:
   template <class T> scoped_refptr<T> ProxyObjectFromHandle(int handle);
-  void InitializeChannelID();
   void InitializeThread();
-  void InitializeChannel();
   void InitializeHandleTracker();
 
-  std::string channel_id_;
   scoped_ptr<base::Thread> thread_;
   scoped_ptr<IPC::SyncChannel> channel_;
   scoped_ptr<AutomationHandleTracker> tracker_;
 
   base::WaitableEvent app_launched_;
   base::WaitableEvent initial_loads_complete_;
   base::WaitableEvent new_tab_ui_load_complete_;
   int new_tab_ui_load_time_;
 
   // An event that notifies when we are shutting-down.
@@ skipping 17 matching lines @@
 
   // Delay to let the browser execute the command.
   base::TimeDelta command_execution_timeout_;
 
   PlatformThreadId listener_thread_id_;
 
   DISALLOW_COPY_AND_ASSIGN(AutomationProxy);
 };
 
 #endif  // CHROME_TEST_AUTOMATION_AUTOMATION_PROXY_H__