Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable.

chrome/browser/media/media_capture_devices_dispatcher.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/media/media_capture_devices_dispatcher.h"
 
 #include "chrome/browser/media/media_stream_capture_indicator.h"
+#include "chrome/browser/prefs/pref_registry_syncable.h"
+#include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/media_devices_monitor.h"
 #include "content/public/common/media_stream_request.h"
 
 using content::BrowserThread;
 using content::MediaStreamDevices;
 
@@ skipping 22 matching lines @@
   return Singleton<MediaCaptureDevicesDispatcher>::get();
 }
 
 MediaCaptureDevicesDispatcher::MediaCaptureDevicesDispatcher()
     : devices_enumerated_(false),
       media_stream_capture_indicator_(new MediaStreamCaptureIndicator()) {}
 
 MediaCaptureDevicesDispatcher::~MediaCaptureDevicesDispatcher() {}
 
 void MediaCaptureDevicesDispatcher::RegisterUserPrefs(
-    PrefServiceSyncable* user_prefs) {
+    PrefService* user_prefs,
+    PrefRegistrySyncable* registry) {
+  // TODO(joi): Get rid of the need for PrefService param above.
   if (!user_prefs->FindPreference(prefs::kDefaultAudioCaptureDevice)) {
-    user_prefs->RegisterStringPref(prefs::kDefaultAudioCaptureDevice,
-                                   std::string(),
-                                   PrefServiceSyncable::UNSYNCABLE_PREF);
+    registry->RegisterStringPref(prefs::kDefaultAudioCaptureDevice,
+                                 std::string(),
+                                 PrefRegistrySyncable::UNSYNCABLE_PREF);
   }
   if (!user_prefs->FindPreference(prefs::kDefaultVideoCaptureDevice)) {
-    user_prefs->RegisterStringPref(prefs::kDefaultVideoCaptureDevice,
-                                   std::string(),
-                                   PrefServiceSyncable::UNSYNCABLE_PREF);
+    registry->RegisterStringPref(prefs::kDefaultVideoCaptureDevice,
+                                 std::string(),
+                                 PrefRegistrySyncable::UNSYNCABLE_PREF);
   }
 }
 
 void MediaCaptureDevicesDispatcher::AddObserver(Observer* observer) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (!observers_.HasObserver(observer))
     observers_.AddObserver(observer);
 }
 
 void MediaCaptureDevicesDispatcher::RemoveObserver(Observer* observer) {
@@ skipping 150 matching lines @@
     int render_process_id,
     int render_view_id,
     const content::MediaStreamDevice& device,
     content::MediaRequestState state) {
   FOR_EACH_OBSERVER(Observer, observers_,
                     OnRequestUpdate(render_process_id,
                                     render_view_id,
                                     device,
                                     state));
 }