Remove unused |first_run| parameter in ImporterHost::CheckForFirefoxLock() which results in a casca…

chrome/test/pyautolib/pyauto.py

 #!/usr/bin/env python
 # Copyright 2013 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,
 run pydoc on this file.
@@ skipping 2974 matching lines @@
     }
     self._GetResultFromJSONRequest(cmd_dict, windex=window_index)
     try:
       f = open(filename)
       all_data = f.read()
       f.close()
       return all_data
     finally:
       shutil.rmtree(tempdir, ignore_errors=True)
 
-  def ImportSettings(self, import_from, first_run,
-                    import_items, windex=0):
+  def ImportSettings(self, import_from, import_items, windex=0):
     """Import the specified import items from the specified browser.
 
     Implements the features available in the "Import Settings" part of the
     first-run UI dialog.
 
     Args:
       import_from: A string indicating which browser to import from. Possible
                    strings (depending on which browsers are installed on the
                    machine) are: 'Mozilla Firefox', 'Google Toolbar',
                    'Microsoft Internet Explorer', 'Safari'
-      first_run: A boolean indicating whether this is the first run of
-                 the browser.
-                 If it is not the first run then:
-                 1) Bookmarks are only imported to the bookmarks bar if there
-                    aren't already bookmarks.
-                 2) The bookmark bar is shown.
       import_items: A list of strings indicating which items to import.
                     Strings that can be in the list are:
                     HISTORY, FAVORITES, PASSWORDS, SEARCH_ENGINES, HOME_PAGE,
                     ALL (note: COOKIES is not supported by the browser yet)
       windex: window index, defaults to 0.
 
     Raises:
       pyauto_errors.JSONInterfaceError if the automation call returns an error.
     """
     cmd_dict = {  # Prepare command for the json interface
       'command': 'ImportSettings',
       'import_from': import_from,
-      'first_run': first_run,
       'import_items': import_items
     }
     return self._GetResultFromJSONRequest(cmd_dict, windex=windex)
 
   def AddSavedPassword(self, password_dict, windex=0):
     """Adds the given username-password combination to the saved passwords.
 
     Args:
       password_dict: a dictionary that represents a password. Example:
       { 'username_value': 'user@example.com',        # Required
@@ skipping 3172 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()