First pass at refactoring pyautolib in preparation for removing proxy dependencies.

chrome/browser/automation/testing_automation_provider.h

 // Copyright (c) 2012 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_BROWSER_AUTOMATION_TESTING_AUTOMATION_PROVIDER_H_
 #define CHROME_BROWSER_AUTOMATION_TESTING_AUTOMATION_PROVIDER_H_
 #pragma once
 
 #include <map>
 #include <string>
@@ skipping 46 matching lines @@
 class TestingAutomationProvider : public AutomationProvider,
                                   public BrowserList::Observer,
                                   public importer::ImporterListObserver,
                                   public content::NotificationObserver {
  public:
   explicit TestingAutomationProvider(Profile* profile);
 
   virtual IPC::Channel::Mode GetChannelMode(bool use_named_interface);
 
   // IPC::Channel::Listener:
+  //
   virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
   virtual void OnChannelError() OVERRIDE;
 
  private:
   // Storage for ImportSettings() to resume operations after a callback.
   struct ImportSettingsData {
     string16 browser_name;
     int import_items;
     bool first_run;
     Browser* browser;
@@ skipping 163 matching lines @@
                                            IPC::Message* reply_message);
 
   void GoForwardBlockUntilNavigationsComplete(int handle,
                                               int number_of_navigations,
                                               IPC::Message* reply_message);
 
   void SetShelfVisibility(int handle, bool visible);
 
   // Generic pattern for pyautolib
   // Uses the JSON interface for input/output.
-  void SendJSONRequest(int handle,
+  void SendJSONRequestWithHandle(int handle,
+                                 const std::string& json_request,
+                                 IPC::Message* reply_message);
+  void SendJSONRequestWithIndex(int index,
+                                const std::string& json_request,
+                                IPC::Message* reply_message);
+  void SendJSONRequest(Browser* browser,
                        const std::string& json_request,
-                       IPC::Message* reply_message);
+                       IPC::Message* reply_message,
+                       bool browser_provided);
 
   // Method ptr for json handlers.
   // Uses the JSON interface for input/output.
   typedef void (TestingAutomationProvider::*JsonHandler)(base::DictionaryValue*,
                                                          IPC::Message*);
 
   // Method ptr for json handlers that take a browser argument.
   // Uses the JSON interface for input/output.
   typedef void (TestingAutomationProvider::*BrowserJsonHandler)(
       Browser* browser,
       base::DictionaryValue*,
       IPC::Message*);
 
+  // JSON interface helper functions.
+  static DictionaryValue* ParseJSONRequestCommand(
+      const std::string& json_request,
+      std::string* command,
+      std::string* error);
+  static void BuildJSONHandlerMaps(
+      std::map<std::string, JsonHandler>* handler_map,
+      std::map<std::string, BrowserJsonHandler>* browser_handler_map);
+
   // Set window dimensions.
   // Uses the JSON interface for input/output.
   void SetWindowDimensions(Browser* browser,
                            base::DictionaryValue* args,
                            IPC::Message* reply_message);
 
   // Get info about infobars in the given WebContents object.
   // This includes info about the type of infobars, the message text,
   // buttons, etc.
   // Caller owns the returned object.
@@ skipping 1280 matching lines @@
   ImportSettingsData import_settings_data_;
 
   // The automation event observer queue. It is lazily created when an observer
   // is added to avoid overhead when not needed.
   scoped_ptr<AutomationEventQueue> automation_event_queue_;
 
   DISALLOW_COPY_AND_ASSIGN(TestingAutomationProvider);
 };
 
 #endif  // CHROME_BROWSER_AUTOMATION_TESTING_AUTOMATION_PROVIDER_H_