Make importer obey import_search_engine preference even if FRUI is enabled.

With this change importer will give preference to the value specified in master
preference for import_search_engine instead of ignoring it like before.

BUG=23649
TEST=Specified in above bug.

Review URL: http://codereview.chromium.org/274081

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

1 files changed, 6 insertions, 3 deletions

diff --git a/chrome/browser/views/first_run_customize_view.cc b/chrome/browser/views/first_run_customize_view.cc
index 8ed49b3..eaae13a 100644
--- a/chrome/browser/views/first_run_customize_view.cc
+++ b/chrome/browser/views/first_run_customize_view.cc
@@ -25,8 +25,11 @@ FirstRunCustomizeView::FirstRunCustomizeView(Profile* profile,
                                              ImporterHost* importer_host,
                                              CustomizeViewObserver* observer,
                                              bool default_browser_checked,
-                                             bool homepage_defined)
-    : FirstRunViewBase(profile, homepage_defined),
+                                             bool homepage_defined,
+                                             int import_items,
+                                             int dont_import_items)
+    : FirstRunViewBase(profile, homepage_defined, import_items,
+                       dont_import_items),
       main_label_(NULL),
       import_cbox_(NULL),
       import_from_combo_(NULL),
@@ -204,7 +207,7 @@ bool FirstRunCustomizeView::Accept() {
     int browser_selected = import_from_combo_->selected_item();
     FirstRun::ImportSettings(profile_,
         importer_host_->GetSourceProfileInfoAt(browser_selected).browser_type,
-        GetDefaultImportItems(), window()->GetNativeWindow());
+        GetImportItems(), window()->GetNativeWindow());
   }
   if (default_browser_->checked())
     SetDefaultBrowser();