Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable.

chrome/browser/download/chrome_download_manager_delegate.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/download/chrome_download_manager_delegate.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 16 matching lines @@
 #include "chrome/browser/download/download_util.h"
 #include "chrome/browser/download/save_package_file_picker.h"
 #include "chrome/browser/extensions/api/downloads/downloads_api.h"
 #include "chrome/browser/extensions/crx_installer.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/history/history_service.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/intents/web_intents_util.h"
 #include "chrome/browser/platform_util.h"
+#include "chrome/browser/prefs/pref_registry_syncable.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/host_desktop.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/feature_switch.h"
 #include "chrome/common/extensions/user_script.h"
 #include "chrome/common/pref_names.h"
@@ skipping 453 matching lines @@
   return false;
 #endif
 }
 
 void ChromeDownloadManagerDelegate::GetSaveDir(
     BrowserContext* browser_context,
     base::FilePath* website_save_dir,
     base::FilePath* download_save_dir,
     bool* skip_dir_check) {
   Profile* profile = Profile::FromBrowserContext(browser_context);
-  PrefServiceSyncable* prefs = profile->GetPrefs();
+  PrefService* prefs = profile->GetPrefs();
 
   // Check whether the preference has the preferred directory for saving file.
   // If not, initialize it with default directory.
   if (!prefs->FindPreference(prefs::kSaveFileDefaultDirectory)) {
     DCHECK(prefs->FindPreference(prefs::kDownloadDefaultDirectory));
     base::FilePath default_save_path = prefs->GetFilePath(
         prefs::kDownloadDefaultDirectory);
-    prefs->RegisterFilePathPref(prefs::kSaveFileDefaultDirectory,
-                                default_save_path,
-                                PrefServiceSyncable::UNSYNCABLE_PREF);
+
+    // TODO(joi): All registration should be done up front.
+    scoped_refptr<PrefRegistrySyncable> registry(
+        static_cast<PrefRegistrySyncable*>(prefs->DeprecatedGetPrefRegistry()));
+    registry->RegisterFilePathPref(prefs::kSaveFileDefaultDirectory,
+                                   default_save_path,
+                                   PrefRegistrySyncable::UNSYNCABLE_PREF);
   }
 
   // Get the directory from preference.
   *website_save_dir = prefs->GetFilePath(prefs::kSaveFileDefaultDirectory);
   DCHECK(!website_save_dir->empty());
 
   *download_save_dir = prefs->GetFilePath(prefs::kDownloadDefaultDirectory);
 
   *skip_dir_check = false;
 #if defined(OS_CHROMEOS)
@@ skipping 395 matching lines @@
     // TODO(asanka): This logic is a hack. DownloadFilePicker should give us a
     //               directory to persist. Or perhaps, if the Drive path
     //               substitution logic is moved here, then we would have a
     //               persistable path after the DownloadFilePicker is done.
     if (disposition == DownloadItem::TARGET_DISPOSITION_PROMPT &&
         !download->IsTemporary())
       last_download_path_ = target_path.DirName();
   }
   callback.Run(target_path, disposition, danger_type, intermediate_path);
 }