Integrate registry_hash_store_contents with the rest of tracked prefs.

chrome/browser/prefs/profile_pref_store_manager.cc

 // Copyright 2014 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/prefs/profile_pref_store_manager.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/files/file_util.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/sequenced_task_runner.h"
 #include "build/build_config.h"
 #include "chrome/common/chrome_constants.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "components/prefs/json_pref_store.h"
 #include "components/prefs/persistent_pref_store.h"
 #include "components/prefs/pref_registry_simple.h"
 #include "components/user_prefs/tracked/pref_hash_store_impl.h"
 #include "components/user_prefs/tracked/segregated_pref_store.h"
 #include "components/user_prefs/tracked/tracked_preferences_migration.h"
 
+#if defined(OS_WIN)
+#include "chrome/installer/util/browser_distribution.h"
+#include "components/user_prefs/tracked/registry_hash_store_contents_win.h"
+#endif
+
 namespace {
 
 void RemoveValueSilently(const base::WeakPtr<JsonPrefStore> pref_store,
                          const std::string& key) {
   if (pref_store) {
     pref_store->RemoveValueSilently(
         key, WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
   }
 }
 
+#if defined(OS_WIN)
+// Whether we are in testing mode; can be enabled via
+// UseTestingPreferenceValidationRegistryPath(). Forces a different registry key
+// to be used for storing preference validation MACs.
+base::string16 g_preference_validation_registry_path_for_testing;

[gab, 2016/08/08 04:37:44]

This will result in an undesired static initializer, global variables have to be
POD types, given this is always used from the same thread you can make it a raw
pointer initialized to |nullptr| (otherwise you would have had to use a
base::LazyInstance).

[proberge, 2016/08/31 17:30:15]

Done.

+#endif  // OS_WIN
+
 }  // namespace
 
+namespace chrome_prefs {
+
+void SetPreferenceValidationRegistryPathForTesting(base::string16 path) {
+#if defined(OS_WIN)

[gab, 2016/08/08 04:37:44]

Also DCHECK(!path.empty()) maybe?

[proberge, 2016/08/31 17:30:15]

Done.

+  g_preference_validation_registry_path_for_testing = path;
+#endif  // OS_WIN
+}
+
+}  // namespace chrome_prefs
+
 // Preference tracking and protection is not required on platforms where other
 // apps do not have access to chrome's persistent storage.
 const bool ProfilePrefStoreManager::kPlatformSupportsPreferenceTracking =
 #if defined(OS_ANDROID) || defined(OS_CHROMEOS)
     false;
 #else
     true;
 #endif
 
 ProfilePrefStoreManager::ProfilePrefStoreManager(
@@ skipping 53 matching lines @@
     if (it->enforcement_level > PrefHashFilter::NO_ENFORCEMENT) {
       protected_configuration.push_back(*it);
       protected_pref_names.insert(it->name);
     } else {
       unprotected_configuration.push_back(*it);
       unprotected_pref_names.insert(it->name);
     }
   }
 
   std::unique_ptr<PrefHashFilter> unprotected_pref_hash_filter(
-      new PrefHashFilter(GetPrefHashStore(false), unprotected_configuration,
-                         base::Closure(), validation_delegate,
-                         reporting_ids_count_, false));
+      new PrefHashFilter(GetPrefHashStore(false),
+                         GetExternalVerificationPrefHashStore(),
+                         GetExternalVerificationPrefHashStoreContents(),
+                         unprotected_configuration, base::Closure(),
+                         validation_delegate, reporting_ids_count_, false));
   std::unique_ptr<PrefHashFilter> protected_pref_hash_filter(new PrefHashFilter(
-      GetPrefHashStore(true), protected_configuration, on_reset_on_load,
-      validation_delegate, reporting_ids_count_, true));
+      GetPrefHashStore(true), GetExternalVerificationPrefHashStore(),
+      GetExternalVerificationPrefHashStoreContents(), protected_configuration,
+      on_reset_on_load, validation_delegate, reporting_ids_count_, true));
 
   PrefHashFilter* raw_unprotected_pref_hash_filter =
       unprotected_pref_hash_filter.get();
   PrefHashFilter* raw_protected_pref_hash_filter =
       protected_pref_hash_filter.get();
 
   scoped_refptr<JsonPrefStore> unprotected_pref_store(new JsonPrefStore(
       profile_path_.Append(chrome::kPreferencesFilename), io_task_runner.get(),
       std::move(unprotected_pref_hash_filter)));
   // TODO(gab): Remove kDeprecatedProtectedPreferencesFilename as an alternate
   // file in M40+.
   scoped_refptr<JsonPrefStore> protected_pref_store(new JsonPrefStore(
       profile_path_.Append(chrome::kSecurePreferencesFilename),
       profile_path_.Append(chrome::kProtectedPreferencesFilenameDeprecated),
       io_task_runner.get(), std::move(protected_pref_hash_filter)));
 
   SetupTrackedPreferencesMigration(
       unprotected_pref_names, protected_pref_names,
       base::Bind(&RemoveValueSilently, unprotected_pref_store->AsWeakPtr()),
       base::Bind(&RemoveValueSilently, protected_pref_store->AsWeakPtr()),
-      base::Bind(&JsonPrefStore::RegisterOnNextSuccessfulWriteCallback,
+      base::Bind(&JsonPrefStore::RegisterOnNextSuccessfulWriteReply,

[gab, 2016/08/08 04:37:44]

I'd like us to break down this CL as much as possible, +1200 lines is a massive
CL. The changes to the ImportantFileWriter API and incurred side-effects are a
good candidate for the first CL.

[proberge, 2016/08/31 17:30:15]

Acknowledged.

                  unprotected_pref_store->AsWeakPtr()),
-      base::Bind(&JsonPrefStore::RegisterOnNextSuccessfulWriteCallback,
+      base::Bind(&JsonPrefStore::RegisterOnNextSuccessfulWriteReply,
                  protected_pref_store->AsWeakPtr()),
       GetPrefHashStore(false), GetPrefHashStore(true),
       raw_unprotected_pref_hash_filter, raw_protected_pref_hash_filter);
 
   return new SegregatedPrefStore(unprotected_pref_store, protected_pref_store,
                                  protected_pref_names);
 }
 
 bool ProfilePrefStoreManager::InitializePrefsFromMasterPrefs(
     const base::DictionaryValue& master_prefs) {
   // Create the profile directory if it doesn't exist yet (very possible on
   // first run).
   if (!base::CreateDirectory(profile_path_))
     return false;
 
   const base::DictionaryValue* to_serialize = &master_prefs;
   std::unique_ptr<base::DictionaryValue> copy;
 
   if (kPlatformSupportsPreferenceTracking) {
     copy.reset(master_prefs.DeepCopy());
     to_serialize = copy.get();
-    PrefHashFilter(GetPrefHashStore(false),
-                   tracking_configuration_,
-                   base::Closure(),
-                   NULL,
-                   reporting_ids_count_,
-                   false).Initialize(copy.get());
+    PrefHashFilter(
+        GetPrefHashStore(false), GetExternalVerificationPrefHashStore(),
+        GetExternalVerificationPrefHashStoreContents(), tracking_configuration_,
+        base::Closure(), NULL, reporting_ids_count_, false)
+        .Initialize(copy.get());
   }
 
   // This will write out to a single combined file which will be immediately
   // migrated to two files on load.
   JSONFileValueSerializer serializer(
       profile_path_.Append(chrome::kPreferencesFilename));
 
   // Call Serialize (which does IO) on the main thread, which would _normally_
   // be verboten. In this case however, we require this IO to synchronously
   // complete before Chrome can start (as master preferences seed the Local
   // State and Preferences files). This won't trip ThreadIORestrictions as they
   // won't have kicked in yet on the main thread.
   bool success = serializer.Serialize(*to_serialize);
 
   UMA_HISTOGRAM_BOOLEAN("Settings.InitializedFromMasterPrefs", success);
   return success;
 }
 
 std::unique_ptr<PrefHashStore> ProfilePrefStoreManager::GetPrefHashStore(
     bool use_super_mac) {
   DCHECK(kPlatformSupportsPreferenceTracking);
 
   return std::unique_ptr<PrefHashStore>(
       new PrefHashStoreImpl(seed_, device_id_, use_super_mac));
 }
+
+std::unique_ptr<PrefHashStore>
+ProfilePrefStoreManager::GetExternalVerificationPrefHashStore() {
+  DCHECK(kPlatformSupportsPreferenceTracking);
+#if defined(OS_WIN)
+  return std::unique_ptr<PrefHashStore>(
+      new PrefHashStoreImpl("ChromiumRegistryHashStoreValidationSeed",

[gab, 2016/08/08 04:37:44]

Use Chrome instead of Chromium I'd say (this is the general recommendation in
comments too : Chromium is the project, Chrome is the product).

[proberge, 2016/08/31 17:30:15]

Done.

+                            device_id_, false /* use_super_mac */));
+#else
+  return nullptr;
+#endif
+}
+
+std::unique_ptr<HashStoreContents>
+ProfilePrefStoreManager::GetExternalVerificationPrefHashStoreContents() {
+  DCHECK(kPlatformSupportsPreferenceTracking);
+#if defined(OS_WIN)
+  if (g_preference_validation_registry_path_for_testing.size() > 0) {

[gab, 2016/08/08 04:37:44]

!empty() instead of size() > 0

(but actually now that it will be a pointer, simply test for nullptr)

[proberge, 2016/08/31 17:30:15]

Done.

+    return std::unique_ptr<HashStoreContents>(new RegistryHashStoreContentsWin(
+        g_preference_validation_registry_path_for_testing,
+        profile_path_.BaseName().LossyDisplayName()));
+  }
+
+  return std::unique_ptr<HashStoreContents>(new RegistryHashStoreContentsWin(
+      BrowserDistribution::GetDistribution()->GetRegistryPath(),
+      profile_path_.BaseName().LossyDisplayName()));
+#else
+  return nullptr;
+#endif
+}