Clean up first run:

chrome/browser/chrome_browser_main.cc

Index: chrome/browser/chrome_browser_main.cc
===================================================================
--- chrome/browser/chrome_browser_main.cc	(revision 127051)
+++ chrome/browser/chrome_browser_main.cc	(working copy)
@@ -40,7 +40,6 @@
 #include "chrome/browser/extensions/extension_protocols.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extensions_startup.h"
-#include "chrome/browser/first_run/first_run_browser_process.h"
 #include "chrome/browser/first_run/upgrade_util.h"
 #include "chrome/browser/google/google_url_tracker.h"
 #include "chrome/browser/google/google_util.h"
@@ -1141,20 +1140,13 @@
   // unlocked in PostBrowserStart().
   process_singleton_->Lock(NULL);
 
-  is_first_run_ = first_run::IsChromeFirstRun() ||
-      parsed_command_line().HasSwitch(switches::kFirstRun);
+  is_first_run_ =
+      (first_run::IsChromeFirstRun() ||
+          parsed_command_line().HasSwitch(switches::kFirstRun)) &&
+      !parsed_command_line().HasSwitch(switches::kImport) &&
+      !parsed_command_line().HasSwitch(switches::kImportFromFile);
+  browser_process_.reset(new BrowserProcessImpl(parsed_command_line()));
 
-  if (parsed_command_line().HasSwitch(switches::kImport) ||
-      parsed_command_line().HasSwitch(switches::kImportFromFile)) {
-    // We use different BrowserProcess when importing so no GoogleURLTracker is
-    // instantiated (as it makes a net::URLRequest and we don't have an IO
-    // thread, see bug #1292702).
-    browser_process_.reset(new FirstRunBrowserProcess(parsed_command_line()));
-    is_first_run_ = false;
-  } else {
-    browser_process_.reset(new BrowserProcessImpl(parsed_command_line()));
-  }
-
   if (parsed_command_line().HasSwitch(switches::kEnableProfiling)) {
     // User wants to override default tracking status.
     std::string flag =