Fix windows registry loader to carry over prefs from file thread correctly

chrome/browser/extensions/external_registry_loader_win_unittest.cc

Index: chrome/browser/extensions/external_registry_loader_win_unittest.cc
diff --git a/chrome/browser/extensions/external_registry_loader_win_unittest.cc b/chrome/browser/extensions/external_registry_loader_win_unittest.cc
index cc83b7c60a10892ae14b48ebbebf4a6e0107365f..336286a1b601fd2a7063b4ddc6bc854e26721bbd 100644
--- a/chrome/browser/extensions/external_registry_loader_win_unittest.cc
+++ b/chrome/browser/extensions/external_registry_loader_win_unittest.cc
@@ -8,13 +8,17 @@
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/run_loop.h"
+#include "base/values.h"
 #include "content/public/test/test_browser_thread_bundle.h"
+#include "extensions/common/value_builder.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace extensions {
 
 namespace {
 
+const char kDummyRegistryKey[] = "dummyId";
+
 class TestExternalRegistryLoader : public ExternalRegistryLoader {
  public:
   TestExternalRegistryLoader() {}
@@ -26,19 +30,32 @@ class TestExternalRegistryLoader : public ExternalRegistryLoader {
     run_loop_.Run();
   }
 
+  std::vector<int> GetPrefsTestIds() { return prefs_test_ids_; }
+
  private:
   ~TestExternalRegistryLoader() override {}
 
+  std::unique_ptr<base::DictionaryValue> LoadPrefsOnFileThread() override {
+    return DictionaryBuilder().Set(kDummyRegistryKey, id_++).Build();
+  }
   void LoadFinished() override {
     ExternalRegistryLoader::LoadFinished();
     ++load_finished_count_;
     ASSERT_LE(load_finished_count_, 2);
+
+    EXPECT_TRUE(prefs_);

[Devlin, 2017/04/12 19:32:06]

ASSERT_TRUE

[lazyboy, 2017/04/12 20:56:22]

Done.

+    int prefs_test_id = -1;
+    EXPECT_TRUE(prefs_->GetInteger(kDummyRegistryKey, &prefs_test_id));
+    prefs_test_ids_.push_back(prefs_test_id);
+
     if (load_finished_count_ == 2)
       run_loop_.Quit();
   }
 
   base::RunLoop run_loop_;
   int load_finished_count_ = 0;
+  int id_ = 0;
+  std::vector<int> prefs_test_ids_;
 
   DISALLOW_COPY_AND_ASSIGN(TestExternalRegistryLoader);
 };
@@ -71,4 +88,26 @@ TEST_F(ExternalRegistryLoaderUnittest, TwoStartLoadingDoesNotCrash) {
   base::RunLoop().RunUntilIdle();
 }
 
+// Tests that calling StartLoading() twice does not overwrite previous prefs
+// before LoadFinished consumes it.
+// Regression test for https://crbug.com/709304: if two StartLoading() schedules
+// two LoadPrefsOnFileThread, then the second LoadPrefsOnFileThread could
+// overwrite the first one's prefs.
+TEST_F(ExternalRegistryLoaderUnittest, TwoStartLoadingDoesNotOverwritePrefs) {
+  scoped_refptr<TestExternalRegistryLoader> test_loader =
+      make_scoped_refptr(new TestExternalRegistryLoader());
+
+  test_loader->StartLoading();
+  test_loader->StartLoading();
+
+  test_loader->WaitForTwoLoadsToFinished();
+  // Let registry watcher code complete.
+  base::RunLoop().RunUntilIdle();
+
+  std::vector<int> prefs_test_ids = test_loader->GetPrefsTestIds();
+  ASSERT_EQ(2u, prefs_test_ids.size());
+  EXPECT_EQ(0, prefs_test_ids[0]);
+  EXPECT_EQ(1, prefs_test_ids[1]);
+}
+
 }  // namespace extensions