Changes requested by gab for previously committed CLs.

chrome/browser/prefs/profile_pref_store_manager.cc

Index: chrome/browser/prefs/profile_pref_store_manager.cc
diff --git a/chrome/browser/prefs/profile_pref_store_manager.cc b/chrome/browser/prefs/profile_pref_store_manager.cc
index 17dab987bece2f77bbde3f6f107271df01b995e9..da4c9987de4e2a32879d3f78b0dab265f77d3a0d 100644
--- a/chrome/browser/prefs/profile_pref_store_manager.cc
+++ b/chrome/browser/prefs/profile_pref_store_manager.cc
@@ -131,23 +131,10 @@ class DictionaryPrefStore : public PrefStore {
   DISALLOW_COPY_AND_ASSIGN(DictionaryPrefStore);
 };
 
-}  // namespace
-
-// TODO(erikwright): Enable this on Chrome OS and Android once MACs are moved
-// out of Local State. This will resolve a race condition on Android and a
-// privacy issue on ChromeOS. http://crbug.com/349158
-const bool ProfilePrefStoreManager::kPlatformSupportsPreferenceTracking =
-#if defined(OS_ANDROID) || defined(OS_CHROMEOS)
-    false;
-#else
-    true;
-#endif
-
 // Waits for a PrefStore to be initialized and then initializes the
 // corresponding PrefHashStore.
 // The observer deletes itself when its work is completed.
-class ProfilePrefStoreManager::InitializeHashStoreObserver
-    : public PrefStore::Observer {
+class InitializeHashStoreObserver : public PrefStore::Observer {
  public:
   // Creates an observer that will initialize |pref_hash_store| with the
   // contents of |pref_store| when the latter is fully loaded.
@@ -178,15 +165,11 @@ class ProfilePrefStoreManager::InitializeHashStoreObserver
   DISALLOW_COPY_AND_ASSIGN(InitializeHashStoreObserver);
 };
 
-ProfilePrefStoreManager::InitializeHashStoreObserver::
-    ~InitializeHashStoreObserver() {}
+InitializeHashStoreObserver::~InitializeHashStoreObserver() {}
 
-void ProfilePrefStoreManager::InitializeHashStoreObserver::OnPrefValueChanged(
-    const std::string& key) {}
+void InitializeHashStoreObserver::OnPrefValueChanged(const std::string& key) {}
 
-void
-ProfilePrefStoreManager::InitializeHashStoreObserver::OnInitializationCompleted(
-    bool succeeded) {
+void InitializeHashStoreObserver::OnInitializationCompleted(bool succeeded) {
   // If we successfully loaded the preferences _and_ the PrefHashStoreImpl
   // hasn't been initialized by someone else in the meantime, initialize it now.
   const PrefHashStoreImpl::StoreVersion pre_update_version =
@@ -204,6 +187,18 @@ ProfilePrefStoreManager::InitializeHashStoreObserver::OnInitializationCompleted(
   delete this;
 }
 
+}  // namespace
+
+// TODO(erikwright): Enable this on Chrome OS and Android once MACs are moved
+// out of Local State. This will resolve a race condition on Android and a
+// privacy issue on ChromeOS. http://crbug.com/349158
+const bool ProfilePrefStoreManager::kPlatformSupportsPreferenceTracking =
+#if defined(OS_ANDROID) || defined(OS_CHROMEOS)
+    false;
+#else
+    true;
+#endif
+
 ProfilePrefStoreManager::ProfilePrefStoreManager(
     const base::FilePath& profile_path,
     const std::vector<PrefHashFilter::TrackedPreferenceMetadata>&
@@ -252,7 +247,7 @@ base::Time ProfilePrefStoreManager::GetResetTime(PrefService* pref_service) {
 
   // PrefHashFilter::GetResetTime will read the value through the pref service,
   // and thus through the SegregatedPrefStore. Even though it's not listed as
-  // "protected" it will be read from the protected store prefentially to the
+  // "protected" it will be read from the protected store preferentially to the
   // (NULL) value in the unprotected pref store.
   return PrefHashFilter::GetResetTime(pref_service);
 }