Remove unused |first_run| parameter in ImporterHost::CheckForFirefoxLock() which results in a cascade of unused parameter removal.

This is a precursor CL to https://codereview.chromium.org/12670013/

TBR=ben@chromium.org
BUG=219419

Review URL: https://chromiumcodereview.appspot.com/14316007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@196209 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 12 insertions, 23 deletions

diff --git a/chrome/browser/importer/external_process_importer_host.cc b/chrome/browser/importer/external_process_importer_host.cc
index 6584a1a..0d3acfe 100644
--- a/chrome/browser/importer/external_process_importer_host.cc
+++ b/chrome/browser/importer/external_process_importer_host.cc
@@ -30,8 +30,7 @@ void ExternalProcessImporterHost::StartImportSettings(
     const importer::SourceProfile& source_profile,
     Profile* target_profile,
     uint16 items,
-    ProfileWriter* writer,
-    bool first_run) {
+    ProfileWriter* writer) {
   // We really only support importing from one host at a time.
   DCHECK(!profile_);
   DCHECK(target_profile);
@@ -43,7 +42,7 @@ void ExternalProcessImporterHost::StartImportSettings(
 
   ImporterHost::AddRef();  // Balanced in ImporterHost::NotifyImportEnded.
 
-  CheckForFirefoxLock(source_profile, items, first_run);
+  CheckForFirefoxLock(source_profile, items);
   CheckForLoadedModels(items);
 
   InvokeTaskIfDone();
diff --git a/chrome/browser/importer/external_process_importer_host.h b/chrome/browser/importer/external_process_importer_host.h
index 9dfe20c..1f1c3d6 100644
--- a/chrome/browser/importer/external_process_importer_host.h
+++ b/chrome/browser/importer/external_process_importer_host.h
@@ -35,8 +35,7 @@ class ExternalProcessImporterHost : public ImporterHost {
       const importer::SourceProfile& source_profile,
       Profile* target_profile,
       uint16 items,
-      ProfileWriter* writer,
-      bool first_run) OVERRIDE;
+      ProfileWriter* writer) OVERRIDE;
   virtual void InvokeTaskIfDone() OVERRIDE;
   virtual void Loaded(BookmarkModel* model, bool ids_reassigned) OVERRIDE;
 
diff --git a/chrome/browser/importer/firefox_importer_unittest.cc b/chrome/browser/importer/firefox_importer_unittest.cc
index 8c8b9fa..b021871 100644
--- a/chrome/browser/importer/firefox_importer_unittest.cc
+++ b/chrome/browser/importer/firefox_importer_unittest.cc
@@ -428,7 +428,7 @@ class FirefoxProfileImporterTest : public ImporterTest {
       items = items | importer::SEARCH_ENGINES;
     loop->PostTask(FROM_HERE, base::Bind(
         &ImporterHost::StartImportSettings, host.get(), source_profile,
-        profile_.get(), items, make_scoped_refptr(writer), true));
+        profile_.get(), items, make_scoped_refptr(writer)));
     loop->Run();
   }
 
@@ -473,8 +473,7 @@ TEST_F(FirefoxProfileImporterTest, MAYBE_IMPORTER(Firefox2Importer)) {
       profile_.get(),
       importer::HISTORY | importer::PASSWORDS |
       importer::FAVORITES | importer::SEARCH_ENGINES,
-      make_scoped_refptr(observer),
-      true));
+      make_scoped_refptr(observer)));
   loop->Run();
 }
 
diff --git a/chrome/browser/importer/ie_importer_unittest_win.cc b/chrome/browser/importer/ie_importer_unittest_win.cc
index fe752e2..85b915b 100644
--- a/chrome/browser/importer/ie_importer_unittest_win.cc
+++ b/chrome/browser/importer/ie_importer_unittest_win.cc
@@ -520,8 +520,7 @@ TEST_F(IEImporterTest, IEImporter) {
       source_profile,
       profile_.get(),
       importer::HISTORY | importer::PASSWORDS | importer::FAVORITES,
-      observer,
-      true));
+      observer));
   loop->Run();
 
   // Cleans up.
@@ -599,8 +598,7 @@ TEST_F(IEImporterTest, IEImporterMalformedFavoritesRegistry) {
         source_profile,
         profile_.get(),
         importer::FAVORITES,
-        observer,
-        true));
+        observer));
     loop->Run();
   }
 }
diff --git a/chrome/browser/importer/importer_host.cc b/chrome/browser/importer/importer_host.cc
index f1cbca9..b500571 100644
--- a/chrome/browser/importer/importer_host.cc
+++ b/chrome/browser/importer/importer_host.cc
@@ -107,8 +107,7 @@ void ImporterHost::StartImportSettings(
     const importer::SourceProfile& source_profile,
     Profile* target_profile,
     uint16 items,
-    ProfileWriter* writer,
-    bool first_run) {
+    ProfileWriter* writer) {
   // We really only support importing from one host at a time.
   DCHECK(!profile_);
   DCHECK(target_profile);
@@ -144,7 +143,7 @@ void ImporterHost::StartImportSettings(
   task_ = base::Bind(
       &Importer::StartImport, importer_, source_profile, items, bridge);
 
-  CheckForFirefoxLock(source_profile, items, first_run);
+  CheckForFirefoxLock(source_profile, items);
 
 #if defined(OS_WIN)
   // For google toolbar import, we need the user to log in and store their GAIA
@@ -202,8 +201,7 @@ ImporterHost::~ImporterHost() {
 
 void ImporterHost::CheckForFirefoxLock(
     const importer::SourceProfile& source_profile,
-    uint16 items,
-    bool first_run) {
+    uint16 items) {
   if (source_profile.importer_type == importer::TYPE_FIREFOX2 ||
       source_profile.importer_type == importer::TYPE_FIREFOX3) {
     DCHECK(!firefox_lock_.get());
diff --git a/chrome/browser/importer/importer_host.h b/chrome/browser/importer/importer_host.h
index ab90d7c..27bcbfd 100644
--- a/chrome/browser/importer/importer_host.h
+++ b/chrome/browser/importer/importer_host.h
@@ -74,13 +74,11 @@ class ImporterHost : public base::RefCountedThreadSafe<ImporterHost>,
   // |target_profile| - profile to import into.
   // |items| - specifies which data to import (bitmask of importer::ImportItem).
   // |writer| - called to actually write data back to the profile.
-  // |first_run| - true if this method is being called during first run.
   virtual void StartImportSettings(
       const importer::SourceProfile& source_profile,
       Profile* target_profile,
       uint16 items,
-      ProfileWriter* writer,
-      bool first_run);
+      ProfileWriter* writer);
 
   // Cancels the import process.
   virtual void Cancel();
@@ -93,10 +91,8 @@ class ImporterHost : public base::RefCountedThreadSafe<ImporterHost>,
   // prior to continue.
   // |source_profile| - importer profile to import.
   // |items| - specifies which data to import (bitmask of importer::ImportItem).
-  // |first_run| - true if this method is being called during first run.
   void CheckForFirefoxLock(const importer::SourceProfile& source_profile,
-                           uint16 items,
-                           bool first_run);
+                           uint16 items);
 
   // Make sure BookmarkModel and TemplateURLService are loaded before import
   // process starts, if bookmarks and/or search engines are among the items