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

chrome/browser/importer/importer_host.cc

 // 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.
 
 #include "chrome/browser/importer/importer_host.h"
 
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
@@ skipping 89 matching lines @@
   firefox_lock_.reset();  // Release the Firefox profile lock.
   if (observer_)
     observer_->ImportEnded();
   Release();
 }
 
 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);
 
   profile_ = target_profile;
   PrefService* user_prefs = profile_->GetPrefs();
 
   // Make sure only items that were not disabled by policy are imported.
   if (!user_prefs->GetBoolean(prefs::kImportHistory))
     items &= ~importer::HISTORY;
@@ skipping 15 matching lines @@
     return;
   }
 
   importer_->AddRef();
 
   scoped_refptr<InProcessImporterBridge> bridge(
       new InProcessImporterBridge(writer_.get(), this));
   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
   // credentials.
   if (source_profile.importer_type == importer::TYPE_GOOGLE_TOOLBAR5) {
     toolbar_importer_utils::IsGoogleGAIACookieInstalled(
         base::Bind(&ImporterHost::OnGoogleGAIACookieChecked, this), profile_);
     is_source_readable_ = false;
   }
 #endif
@@ skipping 37 matching lines @@
     importer_->Release();
 
   if (installed_bookmark_observer_) {
     DCHECK(profile_);
     BookmarkModelFactory::GetForProfile(profile_)->RemoveObserver(this);
   }
 }
 
 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());
     firefox_lock_.reset(new FirefoxProfileLock(source_profile.source_path));
     if (!firefox_lock_->HasAcquired()) {
       // If fail to acquire the lock, we set the source unreadable and
       // show a warning dialog, unless running without UI.
       is_source_readable_ = false;
       ShowWarningDialog();
     }
@@ skipping 54 matching lines @@
                            const content::NotificationDetails& details) {
   DCHECK(type == chrome::NOTIFICATION_TEMPLATE_URL_SERVICE_LOADED);
   registrar_.RemoveAll();
   InvokeTaskIfDone();
 }
 
 void ImporterHost::OnBrowserRemoved(Browser* browser) {
   if (browser_ == browser)
     browser_ = NULL;
 }