Removal of Profile from content part 6.

chrome/browser/ui/webui/options/import_data_handler.cc

 // Copyright (c) 2011 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/options/import_data_handler.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/callback.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 "content/browser/tab_contents/tab_contents.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 ImportDataHandler::ImportDataHandler() : importer_host_(NULL) {
 }
 
 ImportDataHandler::~ImportDataHandler() {
   if (importer_list_)
     importer_list_->SetObserver(NULL);
@@ skipping 71 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);
-    Profile* profile = web_ui_->GetProfile();
+    Profile* profile =
+        Profile::FromBrowserContext(web_ui_->tab_contents()->browser_context());
     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 << "'.";
   }
 }
 
 void ImportDataHandler::OnSourceProfilesLoaded() {
@@ skipping 32 matching lines @@
 void ImportDataHandler::ImportItemEnded(importer::ImportItem item) {
   // TODO(csilv): show progress detail in the web view.
 }
 
 void ImportDataHandler::ImportEnded() {
   importer_host_->SetObserver(NULL);
   importer_host_ = NULL;
 
   web_ui_->CallJavascriptFunction("ImportDataOverlay.confirmSuccess");
 }