Port the option to import bookmarks from a file to Linux

- Call ImportNow from browser_main.cc
- Move necessary functions and a class from first_run_win.cc to
first_run.cc and update first_run.h accordingly.
- Add some #defines for different OSes and some TODO(port) comments.

These changes will allow the use of the --import-from-file option to
import bookmarks from a file at first run.

I have built and tested this on Linux and Windows.

BUG=32728
TEST=run with --import-from-file

Patch from Brian G. Merrell <bgmerrell@gmail.com>

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=43277

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

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

1 files changed, 4 insertions, 2 deletions

diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc
index 3913c1d..1fe0e88 100644
--- a/chrome/browser/browser_main.cc
+++ b/chrome/browser/browser_main.cc
@@ -905,12 +905,14 @@ int BrowserMain(const MainFunctionParams& parameters) {
     OptionallyRunChromeOSLoginManager(parsed_command_line);
   }
 
+#if !defined(OS_MACOSX)
   // Importing other browser settings is done in a browser-like process
   // that exits when this task has finished.
-#if defined(OS_WIN)
+  // TODO(port):  Port to Mac
   if (parsed_command_line.HasSwitch(switches::kImport) ||
-      parsed_command_line.HasSwitch(switches::kImportFromFile))
+      parsed_command_line.HasSwitch(switches::kImportFromFile)) {
     return FirstRun::ImportNow(profile, parsed_command_line);
+  }
 #endif
 
   // When another process is running, use it instead of starting us.