Remove more references to the deprecated webapp_it2me.

chrome/test/pyautolib/fetch_prebuilt_pyauto.py

 #!/usr/bin/env 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.
 
 """Fetch prebuilt binaries to run PyAuto.
 
 Sets up Chrome and PyAuto binaries using prebuilt binaries from the
 continuous build archives.  Works on mac, win, linux (32 & 64 bit).
 
@@ skipping 63 matching lines @@
       for name in linux_names:
         zip_name = 'chrome-' + name
         if self._DoesURLExist('%s/%s.zip' % (self._url, zip_name)):
           self._chrome_zip_name = zip_name
           break
       else:
         raise RuntimeError('Could not find chrome zip at ' + self._url)
 
     # Setup urls to download.
     self._chrome_zip_url = '%s/%s.zip' % (self._url, self._chrome_zip_name)
-    self._it2me_zip_url = self._url + '/' + 'remoting-it2me.zip'
+    self._remoting_zip_url = self._url + '/' + 'remoting-webapp.zip'
     chrome_test_url = '%s/%s.test' % (self._url, self._chrome_zip_name)
     self._pyautolib_py_url = '%s/pyautolib.py' % chrome_test_url
     if self._options.platform == 'win':
       self._pyautolib_so_name = '_pyautolib.pyd'
       self._chromedriver_name = 'chromedriver.exe'
     else:
       self._pyautolib_so_name = '_pyautolib.so'
       self._chromedriver_name = 'chromedriver'
     self._pyautolib_so_url = chrome_test_url + '/' + self._pyautolib_so_name
     self._chromedriver_url = chrome_test_url + '/' + self._chromedriver_name
 
   def _DoesURLExist(self, url):
     """Determines whether a resource exists at the given URL."""
     parsed = urlparse.urlparse(url)
     conn = httplib.HTTPConnection(parsed.netloc)
     conn.request('HEAD', parsed.path)
     response = conn.getresponse()
     if response.status == 302:  # Redirect; follow it.
       return self._DoesURLExist(response.getheader('location'))
     return response.status == 200
 
   def Cleanup(self):
     """Remove old binaries, if any."""
     pass
 
   def Run(self):
     self._ParseArgs()
     if not os.path.isdir(self._outdir):
       os.makedirs(self._outdir)
-    get_it2me = self._DoesURLExist(self._it2me_zip_url)
+    get_remoting = self._DoesURLExist(self._remoting_zip_url)
 
     # Fetch chrome & pyauto binaries
     print 'Fetching', self._chrome_zip_url
     chrome_zip = urllib.urlretrieve(self._chrome_zip_url)[0]
 
-    if get_it2me:
-      print 'Fetching', self._it2me_zip_url
-      it2me_zip = urllib.urlretrieve(self._it2me_zip_url)[0]
+    if get_remoting:
+      print 'Fetching', self._remoting_zip_url
+      remoting_zip = urllib.urlretrieve(self._remoting_zip_url)[0]
     else:
-      print 'Warning: %s does not exist.' % self._it2me_zip_url
+      print 'Warning: %s does not exist.' % self._remoting_zip_url
 
     print 'Fetching', self._pyautolib_py_url
     pyautolib_py = urllib.urlretrieve(self._pyautolib_py_url)[0]
 
     print 'Fetching', self._pyautolib_so_url
     pyautolib_so = urllib.urlretrieve(self._pyautolib_so_url)[0]
 
     print 'Fetching', self._chromedriver_url
     chromedriver = urllib.urlretrieve(self._chromedriver_url)[0]
 
     chrome_unzip_dir = os.path.join(self._outdir, self._chrome_zip_name)
     if os.path.exists(chrome_unzip_dir):
       print 'Cleaning', chrome_unzip_dir
       pyauto_utils.RemovePath(chrome_unzip_dir)
     print 'Unzipping'
     pyauto_utils.UnzipFilenameToDir(chrome_zip, self._outdir)
-    if get_it2me:
-      pyauto_utils.UnzipFilenameToDir(it2me_zip, self._outdir)
-      shutil.move(self._outdir + '/remoting-it2me',
-                  self._outdir + '/remoting/it2me.webapp')
+    if get_remoting:
+      pyauto_utils.UnzipFilenameToDir(remoting_zip, self._outdir)
+      shutil.move(self._outdir + '/remoting-webapp',
+                  self._outdir + '/remoting/remoting.webapp')
 
     # Copy over the binaries to outdir
     items_to_copy = {
       pyautolib_py: os.path.join(self._outdir, 'pyautolib.py'),
       pyautolib_so: os.path.join(self._outdir, self._pyautolib_so_name),
       chromedriver: os.path.join(self._outdir, self._chromedriver_name)
     }
     unzip_dir_contents = glob.glob(os.path.join(chrome_unzip_dir, '*'))
     for item in unzip_dir_contents:
       name = os.path.basename(item)
@@ skipping 22 matching lines @@
       os.path.lexists(dest) and os.remove(dest)
       print 'Creating symlink "%s"' % dest
       os.symlink(framework, dest)
 
     print 'Prepared binaries in "%s"' % self._outdir
     return 0
 
 
 if __name__ == '__main__':
   sys.exit(FetchPrebuilt().Run())