redesign and reimplement proxy config service and tracker, revise proxy ui on cros

chrome/test/pyautolib/pyauto.py

 #!/usr/bin/python
 
 # Copyright (c) 2011 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.
 
 """PyAuto: Python Interface to Chromium's Automation Proxy.
 
 PyAuto uses swig to expose Automation Proxy interfaces to Python.
 For complete documentation on the functionality available,
@@ skipping 3666 matching lines @@
   PROXY_TYPE_DIRECT = 1
   PROXY_TYPE_MANUAL = 2
   PROXY_TYPE_PAC = 3
 
   def GetProxyTypeName(self, proxy_type):
     values = { self.PROXY_TYPE_DIRECT: 'Direct Internet connection',
                self.PROXY_TYPE_MANUAL: 'Manual proxy configuration',
                self.PROXY_TYPE_PAC: 'Automatic proxy configuration' }
     return values[proxy_type]
 
-  def GetProxySettingsOnChromeOS(self):
+  def GetProxySettingsOnChromeOS(self, windex=0):
     """Get current proxy settings on Chrome OS.
 
     Returns:
       A dictionary. See SetProxySettings() below
       for the full list of possible dictionary keys.
 
       Samples:
       { u'ignorelist': [],
         u'single': False,
         u'type': 1}
 
       { u'ignorelist': [u'www.example.com', u'www.example2.com'],
         u'single': True,
         u'singlehttp': u'24.27.78.152',
         u'singlehttpport': 1728,
         u'type': 2}
 
       { u'ignorelist': [],
         u'pacurl': u'http://example.com/config.pac',
         u'single': False,
         u'type': 3}
 
     Raises:
       pyauto_errors.JSONInterfaceError if the automation call returns an error.
     """
     cmd_dict = { 'command': 'GetProxySettings' }
-    return self._GetResultFromJSONRequest(cmd_dict, windex=-1)
+    return self._GetResultFromJSONRequest(cmd_dict, windex=windex)
 
-  def SetProxySettingsOnChromeOS(self, key, value):
+  def SetProxySettingsOnChromeOS(self, key, value, windex=0):
     """Set a proxy setting on Chrome OS.
 
     Owner must be logged in for these to persist.
     If user is not logged in or is logged in as non-owner or guest,
     proxy settings do not persist across browser restarts or login/logout.
 
     Valid settings are:
       'type': int - Type of proxy. Should be one of:
                      PROXY_TYPE_DIRECT, PROXY_TYPE_MANUAL, PROXY_TYPE_PAC.
       'ignorelist': list - The list of hosts and domains to ignore.
@@ skipping 31 matching lines @@
       self.SetProxySettings('pacurl', 'http://example.com/config.pac')
 
     Raises:
       pyauto_errors.JSONInterfaceError if the automation call returns an error.
     """
     cmd_dict = {
         'command': 'SetProxySettings',
         'key': key,
         'value': value,
     }
-    return self._GetResultFromJSONRequest(cmd_dict, windex=-1)
+    return self._GetResultFromJSONRequest(cmd_dict, windex=windex)
 
   def ForgetWifiNetwork(self, service_path):
     """Forget a remembered network by its service path.
 
     This function is equivalent to clicking the 'Forget Network' button in the
     chrome://settings/internet page.  This function does not indicate whether
     or not forget succeeded or failed.  It is up to the caller to call
     GetNetworkInfo to check the updated remembered_wifi list to verify the
     service has been removed.
 
@@ skipping 988 matching lines @@
     successful = result.wasSuccessful()
     if not successful:
       pyauto_tests_file = os.path.join(self.TestsDir(), self._tests_filename)
       print >>sys.stderr, 'Tests can be disabled by editing %s. ' \
                           'Ref: %s' % (pyauto_tests_file, _PYAUTO_DOC_URL)
     sys.exit(not successful)
 
 
 if __name__ == '__main__':
   Main()