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

chrome/test/functional/imports.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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.
 
 import glob
 import logging
 import optparse
 import os
 import shutil
@@ skipping 183 matching lines @@
     # TODO(nirnimesh): Anything else to be done on other platforms?
     return True
 
   def _ImportFromFirefox(self, bookmarks, history, passwords, home_page,
                          search_engines, window_index=0):
     """Verify importing individual Firefox data through preferences"""
     if not self._CanRunFirefoxTests():
       logging.warn('Not running firefox import tests.')
       return
     self._SwapFirefoxProfile()
-    self.ImportSettings('Mozilla Firefox', False, self._to_import, window_index)
+    self.ImportSettings('Mozilla Firefox', self._to_import, window_index)
     self._CheckDefaults(bookmarks, history, passwords, home_page,
                         search_engines, window_index)
 
   def _GetProfilePath(self):
     """Get profile paths when multiprofile windows are open.
 
     Returns:
       profile: Path for multiprofiles.
     """
     profiles_list = self.GetMultiProfileInfo()['profiles']
     profile1_path = profile2_path = default_path = None
     for profile in profiles_list:
       if profile['path'].find('Profile 1') != -1:
         profile1_path = profile['path']
       elif profile['path'].find('Profile 2') != -1:
         profile2_path = profile['path']
       elif profile['path'].find('Default') != -1:
         default_path = profile['path']
     return default_path, profile1_path, profile2_path
 
   # Tests.
   def testFirefoxImportFromPrefs(self):
     """Verify importing Firefox data through preferences."""
     if not self._CanRunFirefoxTests():
       logging.warn('Not running firefox import tests.')
       return
     if self.IsWinVista():  # Broken on vista. crbug.com/89768
       return
     self._SwapFirefoxProfile()
-    self.ImportSettings('Mozilla Firefox', False, self._to_import)
+    self.ImportSettings('Mozilla Firefox', self._to_import)
     self._CheckDefaults(bookmarks=True, history=True, passwords=True,
                         home_page=False, search_engines=True)
 
-  def testFirefoxFirstRun(self):
-    """Verify importing from Firefox on the first run.
-
-    For Win, only history and homepage will only be imported.
-    Mac and Linux can import history, homepage, and bookmarks.
-    """
-    if not self._CanRunFirefoxTests():
-      logging.warn('Not running firefox import tests.')
-      return
-    self._SwapFirefoxProfile()
-    self.ImportSettings('Mozilla Firefox', True, self._to_import)
-    non_win = not self.IsWin()
-    self._CheckDefaults(bookmarks=non_win, history=True, passwords=True,
-                        home_page=non_win, search_engines=True)
-
   def testImportFirefoxDataTwice(self):
     """Verify importing Firefox data twice.
 
     Bookmarks should be duplicated, but history and passwords should not.
     """
     if not self._CanRunFirefoxTests():
       logging.warn('Not running firefox import tests.')
       return
     if self.IsWinVista():  # Broken on vista. crbug.com/89768
       return
     self._SwapFirefoxProfile()
-    self.ImportSettings('Mozilla Firefox', False, self._to_import)
+    self.ImportSettings('Mozilla Firefox', self._to_import)
     num_history_orig = len(self.GetHistoryInfo().History())
     num_passwords_orig = len(self.GetSavedPasswords())
 
     # Re-import and check for duplicates.
-    self.ImportSettings('Mozilla Firefox', False, self._to_import)
+    self.ImportSettings('Mozilla Firefox', self._to_import)
     self.assertTrue(self._BookmarkDuplicatesExist(
         self._bookmark_bar_items + self._bookmark_folder_items))
     self.assertEqual(num_history_orig, len(self.GetHistoryInfo().History()))
     self.assertEqual(num_passwords_orig, len(self.GetSavedPasswords()))
 
   def testImportFirefoxBookmarksFromPrefs(self):
     """Verify importing Firefox bookmarks through preferences."""
     self._ImportFromFirefox(bookmarks=True, history=False, passwords=False,
                             home_page=False, search_engines=False)
 
@@ skipping 15 matching lines @@
                             home_page=False, search_engines=True)
 
   def testImportFromFirefoxAndSafari(self):
     """Verify importing from Firefox and then Safari."""
     # This test is for Mac only.
     if not self.IsMac():
       return
 
     self._SwapSafariProfile()
     self._SwapFirefoxProfile()
-    self.ImportSettings('Mozilla Firefox', False, self._to_import)
-    self.ImportSettings('Safari', False, self._to_import)
+    self.ImportSettings('Mozilla Firefox', self._to_import)
+    self.ImportSettings('Safari', self._to_import)
 
     self._CheckDefaults(bookmarks=True, history=True, passwords=True,
                         home_page=False, search_engines=True)
     self.assertTrue(self._BookmarkDuplicatesExist(
         self._bookmark_bar_items + self._bookmark_folder_items))
 
   def testSafariImportFromPrefs(self):
     """Verify importing Safari data through preferences."""
     # This test is Mac only.
     if not self.IsMac():
       return
     self._SwapSafariProfile()
-    self.ImportSettings('Safari', False, self._to_import)
+    self.ImportSettings('Safari', self._to_import)
     self._CheckDefaults(bookmarks=True, history=True, passwords=False,
                         home_page=False, search_engines=True)
 
-  def testSafariFirstRun(self):
-    """Verify importing Safari data on the first run."""
-    # This test is Mac only.
-    if not self.IsMac():
-      return
-    self._SwapSafariProfile()
-    self.ImportSettings('Safari', False, self._to_import)
-    self._CheckDefaults(bookmarks=True, history=True, passwords=False,
-                        home_page=False, search_engines=False)
-
   def testImportSafariDataTwice(self):
     """Verify importing Safari data twice.
 
     Bookmarks should be duplicated, but history and passwords should not."""
     # This test is Mac only.
     if not self.IsMac():
       return
     self._SwapSafariProfile()
-    self.ImportSettings('Safari', False, self._to_import)
+    self.ImportSettings('Safari', self._to_import)
     num_history_orig = len(self.GetHistoryInfo().History())
     num_passwords_orig = len(self.GetSavedPasswords())
 
     # Re-import and check for duplicates.
-    self.ImportSettings('Safari', False, self._to_import)
+    self.ImportSettings('Safari', self._to_import)
     self.assertTrue(self._BookmarkDuplicatesExist(
         self._bookmark_bar_items + self._bookmark_folder_items))
     self.assertEqual(num_history_orig, len(self.GetHistoryInfo().History()))
     self.assertEqual(num_passwords_orig, len(self.GetSavedPasswords()))
 
   def testFireFoxImportBookmarksMultiProfile(self):
     """Verify importing Firefox bookmarks through preferences.
 
     Bookmarks are imported from Firefox through the preferences for multiple
     profiles."""
@@ skipping 19 matching lines @@
     bookmarks = self.GetBookmarkModel(1)
     node = bookmarks.FindByTitle('GoogleNews')
     self.assertEqual(0, len(node))
     # Assert if 'BING' is present.
     node = bookmarks.FindByTitle('BING')
     self.assertEqual(1, len(node))
 
 
 if __name__ == '__main__':
   pyauto_functional.Main()