Merge 198707 "Record first run startup metrics."

chrome/browser/first_run/first_run_win.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/first_run/first_run.h"
 
 #include <windows.h>
 #include <shellapi.h>
 #include <shlobj.h>
 
@@ skipping 379 matching lines @@
     profile->GetPrefs()->ReloadPersistentPrefs();
 
   return (import_runner.exit_code() == content::RESULT_CODE_NORMAL_EXIT);
 }
 
 }  // namespace
 
 namespace first_run {
 namespace internal {
 
-void DoPostImportPlatformSpecificTasks() {
+void DoPostImportPlatformSpecificTasks(Profile* /* profile */) {
   // Trigger the Active Setup command for system-level Chromes to finish
   // configuring this user's install (e.g. per-user shortcuts).
   // Delay the task slightly to give Chrome launch I/O priority while also
   // making sure shortcuts are created promptly to avoid annoying the user by
   // re-creating shortcuts he previously deleted.
   static const int64 kTiggerActiveSetupDelaySeconds = 5;
   base::FilePath chrome_exe;
   if (!PathService::Get(base::FILE_EXE, &chrome_exe)) {
     NOTREACHED();
   } else if (!InstallUtil::IsPerUserInstall(chrome_exe.value().c_str())) {
@@ skipping 105 matching lines @@
   int return_code = internal::ImportBookmarkFromFileIfNeeded(profile, cmdline);
 #if !defined(USE_AURA)
   if (cmdline.HasSwitch(switches::kImport)) {
     return_code = ImportFromBrowser(profile, cmdline);
   }
 #endif
   return return_code;
 }
 
 }  // namespace first_run