Refactoring of master preferences parsing before adding a new preference.

chrome/common/temp_scaffolding_stubs.cc

Index: chrome/common/temp_scaffolding_stubs.cc
diff --git a/chrome/common/temp_scaffolding_stubs.cc b/chrome/common/temp_scaffolding_stubs.cc
index 8d914accd49607a6b0555bf0a0f7000f0f049142..b1d6f40c3bcd3d55e7f65ef6fb266d4b10deac9a 100644
--- a/chrome/common/temp_scaffolding_stubs.cc
+++ b/chrome/common/temp_scaffolding_stubs.cc
@@ -145,8 +145,8 @@ void AutomationProvider::OnMessageFromExternalHost(
 // static
 bool FirstRun::ProcessMasterPreferences(const FilePath& user_data_dir,
                                         const FilePath& master_prefs_path,
-                                        int* preference_details,
-                                        std::vector<std::wstring>* new_tabs) {
+                                        std::vector<std::wstring>* new_tabs,
+                                        int* ping_delay) {
   // http://code.google.com/p/chromium/issues/detail?id=11971
   // Pretend we processed them correctly.
   return true;