Some first_run code cleanups (extracted from https://codereview.chromium.org/12670013 to keep that …

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 479 matching lines @@
         GoogleUpdateSettings::SetCollectStatsConsent(false);
       } else if (retcode == installer::EULA_ACCEPTED_OPT_IN) {
         VLOG(1) << "EULA : collection consent";
         GoogleUpdateSettings::SetCollectStatsConsent(true);
       }
     }
   }
   return true;
 }
 
+base::FilePath MasterPrefsPath() {
+  // The standard location of the master prefs is next to the chrome binary.
+  base::FilePath master_prefs;
+  if (!PathService::Get(base::DIR_EXE, &master_prefs))
+    return base::FilePath();
+  return master_prefs.AppendASCII(installer::kDefaultMasterPrefs);
+}
+
 }  // namespace internal
 }  // namespace first_run
 
 namespace first_run {
 
 int ImportNow(Profile* profile, const CommandLine& cmdline) {
   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;
 }
 
-base::FilePath MasterPrefsPath() {
-  // The standard location of the master prefs is next to the chrome binary.
-  base::FilePath master_prefs;
-  if (!PathService::Get(base::DIR_EXE, &master_prefs))
-    return base::FilePath();
-  return master_prefs.AppendASCII(installer::kDefaultMasterPrefs);
-}
-
 }  // namespace first_run