| Index: chrome/browser/renderer_host/pepper/device_id_fetcher.cc
|
| diff --git a/chrome/browser/renderer_host/pepper/device_id_fetcher.cc b/chrome/browser/renderer_host/pepper/device_id_fetcher.cc
|
| index 669815617381bfee27957cb896f9d7efa73c9cc3..79285a63733f4a5f8eb3dc399bfb54fc858c8da2 100644
|
| --- a/chrome/browser/renderer_host/pepper/device_id_fetcher.cc
|
| +++ b/chrome/browser/renderer_host/pepper/device_id_fetcher.cc
|
| @@ -63,13 +63,17 @@ void DeviceIDFetcher::Start(BrowserPpapiHost* browser_host) {
|
| }
|
|
|
| // static
|
| -void DeviceIDFetcher::RegisterUserPrefs(PrefRegistrySyncable* prefs) {
|
| +void DeviceIDFetcher::RegisterUserPrefs(
|
| + user_prefs::PrefRegistrySyncable* prefs) {
|
| // TODO(wad): Once UI is connected, a final default can be set. At that point
|
| // change this pref from UNSYNCABLE to SYNCABLE.
|
| - prefs->RegisterBooleanPref(prefs::kEnableDRM, true,
|
| - PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| - prefs->RegisterStringPref(prefs::kDRMSalt, "",
|
| - PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| + prefs->RegisterBooleanPref(prefs::kEnableDRM,
|
| + true,
|
| + user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| + prefs->RegisterStringPref(
|
| + prefs::kDRMSalt,
|
| + "",
|
| + user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| }
|
|
|
| // static
|
|
|