[Ext Registry] Do not try to re-watch registry if we are already watching it.

chrome/browser/extensions/external_registry_loader_win.cc

 // Copyright (c) 2012 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/extensions/external_registry_loader_win.h"
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_file.h"
@@ skipping 36 matching lines @@
 
 std::string MakePrefName(const std::string& extension_id,
                          const std::string& pref_name) {
   return base::StringPrintf("%s.%s", extension_id.c_str(), pref_name.c_str());
 }
 
 }  // namespace
 
 namespace extensions {
 
+ExternalRegistryLoader::ExternalRegistryLoader()
+    : attempted_watching_registry_(false) {}
+
 void ExternalRegistryLoader::StartLoading() {
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   BrowserThread::PostTask(
       BrowserThread::FILE, FROM_HERE,
       base::Bind(&ExternalRegistryLoader::LoadOnFileThread, this));
 }
 
 std::unique_ptr<base::DictionaryValue>
 ExternalRegistryLoader::LoadPrefsOnFileThread() {
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
@@ skipping 126 matching lines @@
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(&ExternalRegistryLoader::CompleteLoadAndStartWatchingRegistry,
                  this));
 }
 
 void ExternalRegistryLoader::CompleteLoadAndStartWatchingRegistry() {
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   LoadFinished();
 
-  // Start watching registry.
+  // Attempt to watch registry if we haven't already.
+  if (attempted_watching_registry_)
+    return;
+
   LONG result = ERROR_SUCCESS;
   if ((result = hklm_key_.Create(HKEY_LOCAL_MACHINE, kRegistryExtensions,
                                  KEY_NOTIFY | KEY_WOW64_32KEY)) ==
       ERROR_SUCCESS) {
     base::win::RegKey::ChangeCallback callback =
         base::Bind(&ExternalRegistryLoader::OnRegistryKeyChanged,
                    base::Unretained(this), base::Unretained(&hklm_key_));
     hklm_key_.StartWatching(callback);
   } else {
     LOG(WARNING) << "Error observing HKLM: " << result;
   }
 
   if ((result = hkcu_key_.Create(HKEY_CURRENT_USER, kRegistryExtensions,
                                  KEY_NOTIFY)) == ERROR_SUCCESS) {
     base::win::RegKey::ChangeCallback callback =
         base::Bind(&ExternalRegistryLoader::OnRegistryKeyChanged,
                    base::Unretained(this), base::Unretained(&hkcu_key_));
     hkcu_key_.StartWatching(callback);
   } else {
     LOG(WARNING) << "Error observing HKCU: " << result;
   }
+
+  attempted_watching_registry_ = true;
 }
 
 void ExternalRegistryLoader::OnRegistryKeyChanged(base::win::RegKey* key) {
   // |OnRegistryKeyChanged| is removed as an observer when the ChangeCallback is
   // called, so we need to re-register.
   key->StartWatching(base::Bind(&ExternalRegistryLoader::OnRegistryKeyChanged,
                                 base::Unretained(this), base::Unretained(key)));
 
   BrowserThread::PostTask(
       BrowserThread::FILE, FROM_HERE,
       base::Bind(&ExternalRegistryLoader::UpdatePrefsOnFileThread, this));
 }
 
 void ExternalRegistryLoader::UpdatePrefsOnFileThread() {
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   base::TimeTicks start_time = base::TimeTicks::Now();
   std::unique_ptr<base::DictionaryValue> prefs = LoadPrefsOnFileThread();
   LOCAL_HISTOGRAM_TIMES("Extensions.ExternalRegistryLoaderWinUpdate",
                         base::TimeTicks::Now() - start_time);
   BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
                           base::Bind(&ExternalRegistryLoader::OnUpdated, this,
                                      base::Passed(&prefs)));
 }
 
 }  // namespace extensions