Platform-specific prune state storage.

chrome/browser/safe_browsing/incident_reporting/state_store_unittest.cc

Index: chrome/browser/safe_browsing/incident_reporting/state_store_unittest.cc
diff --git a/chrome/browser/safe_browsing/incident_reporting/state_store_unittest.cc b/chrome/browser/safe_browsing/incident_reporting/state_store_unittest.cc
index 5ec58bf226aaf9e725964c076a783c86e7c3f4af..ff12661356e90278fd6095c74d5fba86561b3906 100644
--- a/chrome/browser/safe_browsing/incident_reporting/state_store_unittest.cc
+++ b/chrome/browser/safe_browsing/incident_reporting/state_store_unittest.cc
@@ -16,6 +16,7 @@
 #include "chrome/browser/prefs/pref_service_syncable.h"
 #include "chrome/browser/prefs/pref_service_syncable_factory.h"
 #include "chrome/browser/safe_browsing/incident_reporting/incident.h"
+#include "chrome/browser/safe_browsing/incident_reporting/platform_state_store.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile.h"
@@ -23,11 +24,41 @@
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+#if defined(OS_WIN)
+#include "base/test/test_reg_util_win.h"
+#endif
+
 namespace safe_browsing {
 
+#if defined(OS_WIN)
+
+// A base test fixture that redirects HKCU for testing the platform state store
+// backed by the Windows registry to prevent interference with existing Chrome
+// installs or other tests.
+class PlatformStateStoreTestBase : public ::testing::Test {
+ protected:
+  PlatformStateStoreTestBase() {}
+
+  void SetUp() override {
+    ::testing::Test::SetUp();
+    registry_override_manager_.OverrideRegistry(HKEY_CURRENT_USER);

[robertshield, 2015/09/01 14:20:12]

given that this and the declaration of registry_override_manager_ are the only
things the base class does, you could shorten this by inlining it in
StateStoreTest and doing away with the conditionally-defined base class.

[grt (UTC plus 2), 2015/09/03 18:12:05]

I decided to go this route since other platforms will surely need their own
magic. I like how this isolates the platform-specific changes.

+  }
+
+ private:
+  registry_util::RegistryOverrideManager registry_override_manager_;
+
+  DISALLOW_COPY_AND_ASSIGN(PlatformStateStoreTestBase);
+};
+
+#else  // OS_WIN
+
+using PlatformStateStoreTestBase = ::testing::Test;
+
+#endif  // !OS_WIN
+
 // A test fixture with a testing profile that writes its user prefs to a json
 // file.
-class StateStoreTest : public ::testing::Test {
+class StateStoreTest : public PlatformStateStoreTestBase {
  protected:
   struct TestData {
     IncidentType type;
@@ -42,7 +73,7 @@ class StateStoreTest : public ::testing::Test {
         profile_manager_(TestingBrowserProcess::GetGlobal()) {}
 
   void SetUp() override {
-    testing::Test::SetUp();
+    PlatformStateStoreTestBase::SetUp();
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     ASSERT_TRUE(profile_manager_.SetUp());
     CreateProfile();
@@ -199,10 +230,16 @@ TEST_F(StateStoreTest, PersistenceWithStoreDelete) {
   // Recreate the profile.
   CreateProfile();
 
-  // Verify that the state did not survive.
   StateStore state_store(profile_);
-  for (const auto& data : kTestData_)
+  for (const auto& data : kTestData_) {
+#if defined(USE_PLATFORM_STATE_STORE)
+    // Verify that the state survived.
+    ASSERT_TRUE(state_store.HasBeenReported(data.type, data.key, data.digest));
+#else
+    // Verify that the state did not survive.
     ASSERT_FALSE(state_store.HasBeenReported(data.type, data.key, data.digest));
+#endif
+  }
 }
 
 }  // namespace safe_browsing