Remove browser::FindLastActiveWithProfile call in importer code. There are many ways to create an I…

chrome/browser/ui/webui/options2/import_data_handler2.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/ui/webui/options2/import_data_handler2.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string16.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/importer/external_process_importer_host.h"
 #include "chrome/browser/importer/importer_host.h"
 #include "chrome/browser/importer/importer_list.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/ui/browser_finder.h"
 #include "content/public/browser/web_ui.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace options2 {
 
 ImportDataHandler::ImportDataHandler() : importer_host_(NULL),
                                          import_did_succeed_(false) {
 }
@@ skipping 77 matching lines @@
     // TODO(csilv): Out-of-process import has only been qualified on MacOS X,
     // so we will only use it on that platform since it is required. Remove this
     // conditional logic once oop import is qualified for Linux/Windows.
     // http://crbug.com/22142
 #if defined(OS_MACOSX)
     importer_host_ = new ExternalProcessImporterHost;
 #else
     importer_host_ = new ImporterHost;
 #endif
     importer_host_->SetObserver(this);
+    importer_host_->set_browser(
+        browser::FindBrowserWithWebContents(web_ui()->GetWebContents()));
     Profile* profile = Profile::FromWebUI(web_ui());
     importer_host_->StartImportSettings(source_profile, profile,
                                         import_services,
                                         new ProfileWriter(profile), false);
   } else {
     LOG(WARNING) << "There were no settings to import from '"
         << source_profile.importer_name << "'.";
   }
 }
 
@@ skipping 50 matching lines @@
     web_ui()->CallJavascriptFunction("ImportDataOverlay.confirmSuccess");
   } else {
     base::FundamentalValue state(false);
     web_ui()->CallJavascriptFunction("ImportDataOverlay.setImportingState",
                                      state);
     web_ui()->CallJavascriptFunction("ImportDataOverlay.dismiss");
   }
 }
 
 }  // namespace options2