From 85a61eb46a3f1b93e19cded05773e6784ed1adb7 Mon Sep 17 00:00:00 2001
From: "thakis@chromium.org"
<thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Fri, 29 Jun 2012 03:01:17 +0000
Subject: Revert 144610 (speculative; possibly caused http://crbug.com/135059)
- First pass at refactoring pyautolib in preparation for removing proxy
dependencies.
BUG=132789
TEST=functional/apptest.py, functional/browser.py, functional/navigation.py
Review URL: https://chromiumcodereview.appspot.com/10534163
TBR=craigdh@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10703040
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@144868 0039d316-1c4b-4281-b951-d872f2087c98
---
.../browser/automation/testing_automation_provider.h | 18 +-----------------
1 file changed, 1 insertion(+), 17 deletions(-)
(limited to '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 e916897..a723303 100644
--- a/chrome/browser/automation/testing_automation_provider.h
+++ b/chrome/browser/automation/testing_automation_provider.h
@@ -246,13 +246,7 @@ class TestingAutomationProvider : public AutomationProvider,
// Generic pattern for pyautolib
// Uses the JSON interface for input/output.
- 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,
+ void SendJSONRequest(int handle,
const std::string& json_request,
IPC::Message* reply_message);
@@ -268,13 +262,6 @@ class TestingAutomationProvider : public AutomationProvider,
base::DictionaryValue*,
IPC::Message*);
- // JSON interface helper functions.
- static scoped_ptr<DictionaryValue> ParseJSONRequestCommand(
- 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,
@@ -1568,9 +1555,6 @@ 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_;
--
cgit v1.1