PrefObject -> PrefData

chrome/browser/extensions/api/settings_private/prefs_util.cc

Index: chrome/browser/extensions/api/settings_private/prefs_util.cc
diff --git a/chrome/browser/extensions/api/settings_private/prefs_util.cc b/chrome/browser/extensions/api/settings_private/prefs_util.cc
index 20547c74d729559be19c60c927ca6ef075c4a53e..2cbce9b2f0525e739a3c1d9bb86007c5dbb15603 100644
--- a/chrome/browser/extensions/api/settings_private/prefs_util.cc
+++ b/chrome/browser/extensions/api/settings_private/prefs_util.cc
@@ -122,22 +122,22 @@ api::settings_private::PrefType PrefsUtil::GetType(const std::string& name,
   }
 }
 
-scoped_ptr<api::settings_private::PrefObject> PrefsUtil::GetCrosSettingsPref(
+scoped_ptr<api::settings_private::PrefData> PrefsUtil::GetCrosSettingsPref(
     const std::string& name) {
-  scoped_ptr<api::settings_private::PrefObject> pref_object(
-      new api::settings_private::PrefObject());
+  scoped_ptr<api::settings_private::PrefData> pref_data(
+      new api::settings_private::PrefData());
 
 #if defined(OS_CHROMEOS)
   const base::Value* value = CrosSettings::Get()->GetPref(name);
-  pref_object->key = name;
-  pref_object->type = GetType(name, value->GetType());
-  pref_object->value.reset(value->DeepCopy());
+  pref_data->key = name;
+  pref_data->type = GetType(name, value->GetType());
+  pref_data->value.reset(value->DeepCopy());
 #endif
 
-  return pref_object.Pass();
+  return pref_data.Pass();
 }
 
-scoped_ptr<api::settings_private::PrefObject> PrefsUtil::GetPref(
+scoped_ptr<api::settings_private::PrefData> PrefsUtil::GetPref(
     const std::string& name) {
   if (IsCrosSetting(name))
     return GetCrosSettingsPref(name);
@@ -147,33 +147,33 @@ scoped_ptr<api::settings_private::PrefObject> PrefsUtil::GetPref(
   if (!pref)
     return nullptr;
 
-  scoped_ptr<api::settings_private::PrefObject> pref_object(
-      new api::settings_private::PrefObject());
-  pref_object->key = pref->name();
-  pref_object->type = GetType(name, pref->GetType());
-  pref_object->value.reset(pref->GetValue()->DeepCopy());
+  scoped_ptr<api::settings_private::PrefData> pref_data(
+      new api::settings_private::PrefData());
+  pref_data->key = pref->name();
+  pref_data->type = GetType(name, pref->GetType());
+  pref_data->value.reset(pref->GetValue()->DeepCopy());
 
   if (pref->IsManaged()) {
     if (pref->IsManagedByCustodian()) {
-      pref_object->policy_source =
+      pref_data->policy_source =
           api::settings_private::PolicySource::POLICY_SOURCE_DEVICE;
     } else {
-      pref_object->policy_source =
+      pref_data->policy_source =
           api::settings_private::PolicySource::POLICY_SOURCE_USER;
     }
-    pref_object->policy_enforcement =
+    pref_data->policy_enforcement =
         pref->IsRecommended() ? api::settings_private::PolicyEnforcement::
                                     POLICY_ENFORCEMENT_RECOMMENDED
                               : api::settings_private::PolicyEnforcement::
                                     POLICY_ENFORCEMENT_ENFORCED;
   } else if (!IsPrefUserModifiable(name)) {
-    pref_object->policy_source =
+    pref_data->policy_source =
         api::settings_private::PolicySource::POLICY_SOURCE_USER;
-    pref_object->policy_enforcement =
+    pref_data->policy_enforcement =
         api::settings_private::PolicyEnforcement::POLICY_ENFORCEMENT_ENFORCED;
   }
 
-  return pref_object.Pass();
+  return pref_data.Pass();
 }
 
 bool PrefsUtil::SetPref(const std::string& pref_name,