Merge 22284 - Refactoring of master preferences parsing before adding a new p...

chrome/common/temp_scaffolding_stubs.cc

 // Copyright (c) 2009 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/common/temp_scaffolding_stubs.h"
 
 #include "build/build_config.h"
 
 #include <vector>
 
@@ skipping 127 matching lines @@
   NOTIMPLEMENTED();
 }
 #endif  // defined(OS_MACOSX)
 
 //--------------------------------------------------------------------------
 
 
 // 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;
 }
 
 // static
 int FirstRun::ImportNow(Profile* profile, const CommandLine& cmdline) {
   // http://code.google.com/p/chromium/issues/detail?id=11971
   return 0;
 }
@@ skipping 251 matching lines @@
                           Handler* handler) {
   NOTIMPLEMENTED();
 }
 
 void BookmarkManager::SelectInTree(Profile* profile, const BookmarkNode* node) {
 }
 void BookmarkManager::Show(Profile* profile) {
 }
 
 #endif