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

chrome/browser/automation/testing_automation_provider.h

Index: chrome/browser/automation/testing_automation_provider.h
diff --git a/chrome/browser/automation/testing_automation_provider.h b/chrome/browser/automation/testing_automation_provider.h
index dcb77a92bb77a408ed810d4415bb8cca66028ad7..55b55f182dc7e2601269ff824e44813304a773e9 100644
--- a/chrome/browser/automation/testing_automation_provider.h
+++ b/chrome/browser/automation/testing_automation_provider.h
@@ -247,7 +247,13 @@ class TestingAutomationProvider : public AutomationProvider,
 
   // Generic pattern for pyautolib
   // Uses the JSON interface for input/output.
-  void SendJSONRequest(int handle,
+  void SendJSONRequestWithBrowserHandle(int handle,
+                                        const std::string& json_request,
+                                        IPC::Message* reply_message);
+  void SendJSONRequestWithBrowserIndex(int index,
+                                       const std::string& json_request,
+                                       IPC::Message* reply_message);
+  void SendJSONRequest(Browser* browser,
                        const std::string& json_request,
                        IPC::Message* reply_message);
 
@@ -263,6 +269,13 @@ class TestingAutomationProvider : public AutomationProvider,
       base::DictionaryValue*,
       IPC::Message*);
 
+  // JSON interface helper functions.
+  static scoped_ptr<DictionaryValue*> ParseJSONRequestCommand(

[kkania, 2012/06/19 16:20:12]

I think you want scoped_ptr<DictionaryValue>

[craigdh, 2012/06/19 23:28:52]

Yes, compiler caught that one but I forgot to re-upload with it corrected :-)

+      const std::string& json_request,
+      std::string* command,
+      std::string* error);
+  void BuildJSONHandlerMaps();
+
   // Set window dimensions.
   // Uses the JSON interface for input/output.
   void SetWindowDimensions(Browser* browser,
@@ -1544,6 +1557,9 @@ class TestingAutomationProvider : public AutomationProvider,
   PowerManagerClientObserverForTesting* power_manager_observer_;
 #endif  // defined(OS_CHROMEOS)
 
+  std::map<std::string, JsonHandler> handler_map_;
+  std::map<std::string, BrowserJsonHandler> browser_handler_map_;
+
   // Used to wait on various browser sync events.
   scoped_ptr<ProfileSyncServiceHarness> sync_waiter_;