Refactor RulesRegistryWithCache to RulesRegistry

chrome/browser/extensions/api/declarative/rules_cache_delegate.cc

Index: chrome/browser/extensions/api/declarative/rules_cache_delegate.cc
diff --git a/chrome/browser/extensions/api/declarative/rules_registry_with_cache.cc b/chrome/browser/extensions/api/declarative/rules_cache_delegate.cc
similarity index 42%
copy from chrome/browser/extensions/api/declarative/rules_registry_with_cache.cc
copy to chrome/browser/extensions/api/declarative/rules_cache_delegate.cc
index a452130fb03c26eacd4b2a2c1590c28fdd0c1538..5af6b58bd20d99ea73043db5ad88eb1f1eb72c23 100644
--- a/chrome/browser/extensions/api/declarative/rules_registry_with_cache.cc
+++ b/chrome/browser/extensions/api/declarative/rules_cache_delegate.cc
@@ -1,64 +1,22 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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/api/declarative/rules_registry_with_cache.h"
+#include "chrome/browser/extensions/api/declarative/rules_cache_delegate.h"
 
-#include "base/bind.h"
-#include "base/logging.h"
-#include "base/message_loop/message_loop.h"
-#include "base/metrics/histogram.h"
-#include "base/strings/stringprintf.h"
-#include "base/time/time.h"
-#include "base/values.h"
 #include "chrome/browser/chrome_notification_types.h"
+#include "chrome/browser/extensions/api/declarative/rules_registry.h"
 #include "chrome/browser/extensions/extension_info_map.h"
-#include "chrome/browser/extensions/extension_prefs.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/extensions/extension_util.h"
 #include "chrome/browser/extensions/state_store.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/common/extensions/extension.h"
-#include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 
 namespace {
 
-const char kSuccess[] = "";
-const char kDuplicateRuleId[] = "Duplicate rule ID: %s";
-
-scoped_ptr<base::Value> RulesToValue(
-    const std::vector<linked_ptr<extensions::RulesRegistry::Rule> >& rules) {
-  scoped_ptr<base::ListValue> list(new base::ListValue());
-  for (size_t i = 0; i < rules.size(); ++i)
-    list->Append(rules[i]->ToValue().release());
-  return list.PassAs<base::Value>();
-}
-
-std::vector<linked_ptr<extensions::RulesRegistry::Rule> > RulesFromValue(
-    const base::Value* value) {
-  std::vector<linked_ptr<extensions::RulesRegistry::Rule> > rules;
-
-  const base::ListValue* list = NULL;
-  if (!value || !value->GetAsList(&list))
-    return rules;
-
-  rules.reserve(list->GetSize());
-  for (size_t i = 0; i < list->GetSize(); ++i) {
-    const base::DictionaryValue* dict = NULL;
-    if (!list->GetDictionary(i, &dict))
-      continue;
-    linked_ptr<extensions::RulesRegistry::Rule> rule(
-        new extensions::RulesRegistry::Rule());
-    if (extensions::RulesRegistry::Rule::Populate(*dict, rule.get()))
-      rules.push_back(rule);
-  }
-
-  return rules;
-}
-
 // Returns the key to use for storing declarative rules in the state store.
 std::string GetDeclarativeRuleStorageKey(const std::string& event_name,
                                          bool incognito) {
@@ -70,212 +28,18 @@ std::string GetDeclarativeRuleStorageKey(const std::string& event_name,
 
 }  // namespace
 
-
 namespace extensions {
 
-// RulesRegistryWithCache
-
-RulesRegistryWithCache::RulesRegistryWithCache(
-    Profile* profile,
-    const std::string& event_name,
-    content::BrowserThread::ID owner_thread,
-    bool log_storage_init_delay,
-    scoped_ptr<RuleStorageOnUI>* ui_part)
-    : RulesRegistry(owner_thread, event_name),
-      weak_ptr_factory_(profile ? this : NULL),
-      storage_on_ui_(
-          (profile ? (new RuleStorageOnUI(profile,
-                                          event_name,
-                                          owner_thread,
-                                          weak_ptr_factory_.GetWeakPtr(),
-                                          log_storage_init_delay))->GetWeakPtr()
-                   : base::WeakPtr<RuleStorageOnUI>())),
-      process_changed_rules_requested_(profile ? NOT_SCHEDULED_FOR_PROCESSING
-                                               : NEVER_PROCESS) {
-  if (!profile) {
-    CHECK(!ui_part);
-    return;
-  }
-
-  ui_part->reset(storage_on_ui_.get());
-
-  storage_on_ui_->Init();
-}
-
-std::string RulesRegistryWithCache::AddRules(
-    const std::string& extension_id,
-    const std::vector<linked_ptr<Rule> >& rules) {
-  DCHECK(content::BrowserThread::CurrentlyOn(owner_thread()));
-
-  // Verify that all rule IDs are new.
-  for (std::vector<linked_ptr<Rule> >::const_iterator i =
-      rules.begin(); i != rules.end(); ++i) {
-    const RuleId& rule_id = *((*i)->id);
-    RulesDictionaryKey key(extension_id, rule_id);
-    if (rules_.find(key) != rules_.end())
-      return base::StringPrintf(kDuplicateRuleId, rule_id.c_str());
-  }
-
-  std::string error = AddRulesImpl(extension_id, rules);
+// RulesCacheDelegate
 
-  if (!error.empty())
-    return error;
-
-  // Commit all rules into |rules_| on success.
-  for (std::vector<linked_ptr<Rule> >::const_iterator i =
-      rules.begin(); i != rules.end(); ++i) {
-    const RuleId& rule_id = *((*i)->id);
-    RulesDictionaryKey key(extension_id, rule_id);
-    rules_[key] = *i;
-  }
-
-  MaybeProcessChangedRules(extension_id);
-  return kSuccess;
-}
-
-std::string RulesRegistryWithCache::RemoveRules(
-    const std::string& extension_id,
-    const std::vector<std::string>& rule_identifiers) {
-  DCHECK(content::BrowserThread::CurrentlyOn(owner_thread()));
-
-  std::string error = RemoveRulesImpl(extension_id, rule_identifiers);
-
-  if (!error.empty())
-    return error;
-
-  // Commit removal of rules from |rules_| on success.
-  for (std::vector<std::string>::const_iterator i =
-      rule_identifiers.begin(); i != rule_identifiers.end(); ++i) {
-    RulesDictionaryKey lookup_key(extension_id, *i);
-    rules_.erase(lookup_key);
-  }
-
-  MaybeProcessChangedRules(extension_id);
-  return kSuccess;
-}
-
-std::string RulesRegistryWithCache::RemoveAllRules(
-    const std::string& extension_id) {
-  DCHECK(content::BrowserThread::CurrentlyOn(owner_thread()));
-
-  std::string error = RemoveAllRulesImpl(extension_id);
-
-  if (!error.empty())
-    return error;
-
-  // Commit removal of rules from |rules_| on success.
-  for (RulesDictionary::const_iterator i = rules_.begin();
-      i != rules_.end();) {
-    const RulesDictionaryKey& key = i->first;
-    ++i;
-    if (key.first == extension_id)
-      rules_.erase(key);
-  }
-
-  MaybeProcessChangedRules(extension_id);
-  return kSuccess;
-}
-
-std::string RulesRegistryWithCache::GetRules(
-    const std::string& extension_id,
-    const std::vector<std::string>& rule_identifiers,
-    std::vector<linked_ptr<RulesRegistry::Rule> >* out) {
-  DCHECK(content::BrowserThread::CurrentlyOn(owner_thread()));
-
-  for (std::vector<std::string>::const_iterator i = rule_identifiers.begin();
-      i != rule_identifiers.end(); ++i) {
-    RulesDictionaryKey lookup_key(extension_id, *i);
-    RulesDictionary::iterator entry = rules_.find(lookup_key);
-    if (entry != rules_.end())
-      out->push_back(entry->second);
-  }
-  return kSuccess;
-}
-
-std::string RulesRegistryWithCache::GetAllRules(
-    const std::string& extension_id,
-    std::vector<linked_ptr<RulesRegistry::Rule> >* out) {
-  DCHECK(content::BrowserThread::CurrentlyOn(owner_thread()));
-
-  for (RulesDictionary::const_iterator i = rules_.begin();
-      i != rules_.end(); ++i) {
-    const RulesDictionaryKey& key = i->first;
-    if (key.first == extension_id)
-      out->push_back(i->second);
-  }
-  return kSuccess;
-}
-
-void RulesRegistryWithCache::OnExtensionUnloaded(
-    const std::string& extension_id) {
-  DCHECK(content::BrowserThread::CurrentlyOn(owner_thread()));
-  std::string error = RemoveAllRules(extension_id);
-  if (!error.empty())
-    LOG(ERROR) << error;
-}
-
-RulesRegistryWithCache::~RulesRegistryWithCache() {
-}
-
-void RulesRegistryWithCache::MarkReady(base::Time storage_init_time) {
-  DCHECK(content::BrowserThread::CurrentlyOn(owner_thread()));
-
-  if (!storage_init_time.is_null()) {
-    UMA_HISTOGRAM_TIMES("Extensions.DeclarativeRulesStorageInitialization",
-                        base::Time::Now() - storage_init_time);
-  }
-
-  ready_.Signal();
-}
-
-void RulesRegistryWithCache::DeserializeAndAddRules(
-    const std::string& extension_id,
-    scoped_ptr<base::Value> rules) {
-  DCHECK(content::BrowserThread::CurrentlyOn(owner_thread()));
-
-  AddRules(extension_id, RulesFromValue(rules.get()));
-}
-
-void RulesRegistryWithCache::ProcessChangedRules(
-    const std::string& extension_id) {
-  DCHECK(content::BrowserThread::CurrentlyOn(owner_thread()));
-
-  process_changed_rules_requested_ = NOT_SCHEDULED_FOR_PROCESSING;
-
-  std::vector<linked_ptr<RulesRegistry::Rule> > new_rules;
-  std::string error = GetAllRules(extension_id, &new_rules);
-  DCHECK_EQ(std::string(), error);
-  content::BrowserThread::PostTask(
-      content::BrowserThread::UI,
-      FROM_HERE,
-      base::Bind(&RuleStorageOnUI::WriteToStorage,
-                 storage_on_ui_,
-                 extension_id,
-                 base::Passed(RulesToValue(new_rules))));
-}
-
-void RulesRegistryWithCache::MaybeProcessChangedRules(
-    const std::string& extension_id) {
-  if (process_changed_rules_requested_ != NOT_SCHEDULED_FOR_PROCESSING)
-    return;
-
-  process_changed_rules_requested_ = SCHEDULED_FOR_PROCESSING;
-  ready_.Post(FROM_HERE,
-              base::Bind(&RulesRegistryWithCache::ProcessChangedRules,
-                         weak_ptr_factory_.GetWeakPtr(),
-                         extension_id));
-}
-
-// RulesRegistryWithCache::RuleStorageOnUI
-
-const char RulesRegistryWithCache::RuleStorageOnUI::kRulesStoredKey[] =
+const char RulesCacheDelegate::kRulesStoredKey[] =
     "has_declarative_rules";
 
-RulesRegistryWithCache::RuleStorageOnUI::RuleStorageOnUI(
+RulesCacheDelegate::RulesCacheDelegate(
     Profile* profile,
     const std::string& event_name,
     content::BrowserThread::ID rules_registry_thread,
-    base::WeakPtr<RulesRegistryWithCache> registry,
+    base::WeakPtr<RulesRegistry> registry,
     bool log_storage_init_delay)
     : profile_(profile),
       storage_key_(GetDeclarativeRuleStorageKey(event_name,
@@ -288,24 +52,23 @@ RulesRegistryWithCache::RuleStorageOnUI::RuleStorageOnUI(
       notified_registry_(false),
       weak_ptr_factory_(this) {}
 
-RulesRegistryWithCache::RuleStorageOnUI::~RuleStorageOnUI() {}
+RulesCacheDelegate::~RulesCacheDelegate() {}
 
 // Returns the key to use for storing whether the rules have been stored.
 // static
-std::string RulesRegistryWithCache::RuleStorageOnUI::GetRulesStoredKey(
-    const std::string& event_name,
-    bool incognito) {
+std::string RulesCacheDelegate::GetRulesStoredKey(const std::string& event_name,
+                                                  bool incognito) {
   std::string result(kRulesStoredKey);
   result += incognito ? ".incognito." : ".";
   return result + event_name;
 }
 
-// This is called from the constructor of RulesRegistryWithCache, so it is
+// This is called from the constructor of RulesRegistry, so it is
 // important that it both
 // 1. calls no (in particular virtual) methods of the rules registry, and
 // 2. does not create scoped_refptr holding the registry. (A short-lived
 // scoped_refptr might delete the rules registry before it is constructed.)
-void RulesRegistryWithCache::RuleStorageOnUI::Init() {
+void RulesCacheDelegate::Init() {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
 
   ExtensionSystem& system = *ExtensionSystem::Get(profile_);
@@ -322,15 +85,15 @@ void RulesRegistryWithCache::RuleStorageOnUI::Init() {
 
   system.ready().Post(
       FROM_HERE,
-      base::Bind(&RuleStorageOnUI::ReadRulesForInstalledExtensions,
+      base::Bind(&RulesCacheDelegate::ReadRulesForInstalledExtensions,
                  GetWeakPtr()));
   system.ready().Post(FROM_HERE,
-                      base::Bind(&RuleStorageOnUI::CheckIfReady, GetWeakPtr()));
+                      base::Bind(&RulesCacheDelegate::CheckIfReady,
+                                 GetWeakPtr()));
 }
 
-void RulesRegistryWithCache::RuleStorageOnUI::WriteToStorage(
-    const std::string& extension_id,
-    scoped_ptr<base::Value> value) {
+void RulesCacheDelegate::WriteToStorage(const std::string& extension_id,
+                                     scoped_ptr<base::Value> value) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   if (!profile_)
     return;
@@ -348,7 +111,7 @@ void RulesRegistryWithCache::RuleStorageOnUI::WriteToStorage(
     store->SetExtensionValue(extension_id, storage_key_, value.Pass());
 }
 
-void RulesRegistryWithCache::RuleStorageOnUI::Observe(
+void RulesCacheDelegate::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
@@ -372,7 +135,7 @@ void RulesRegistryWithCache::RuleStorageOnUI::Observe(
   }
 }
 
-void RulesRegistryWithCache::RuleStorageOnUI::CheckIfReady() {
+void RulesCacheDelegate::CheckIfReady() {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   if (notified_registry_ || !waiting_for_extensions_.empty())
     return;
@@ -381,12 +144,11 @@ void RulesRegistryWithCache::RuleStorageOnUI::CheckIfReady() {
       rules_registry_thread_,
       FROM_HERE,
       base::Bind(
-          &RulesRegistryWithCache::MarkReady, registry_, storage_init_time_));
+          &RulesRegistry::MarkReady, registry_, storage_init_time_));
   notified_registry_ = true;
 }
 
-void
-RulesRegistryWithCache::RuleStorageOnUI::ReadRulesForInstalledExtensions() {
+void RulesCacheDelegate::ReadRulesForInstalledExtensions() {
   ExtensionSystem& system = *ExtensionSystem::Get(profile_);
   ExtensionService* extension_service = system.extension_service();
   DCHECK(extension_service);
@@ -410,8 +172,7 @@ RulesRegistryWithCache::RuleStorageOnUI::ReadRulesForInstalledExtensions() {
   }
 }
 
-void RulesRegistryWithCache::RuleStorageOnUI::ReadFromStorage(
-    const std::string& extension_id) {
+void RulesCacheDelegate::ReadFromStorage(const std::string& extension_id) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   if (!profile_)
     return;
@@ -421,7 +182,7 @@ void RulesRegistryWithCache::RuleStorageOnUI::ReadFromStorage(
 
   if (!GetDeclarativeRulesStored(extension_id)) {
     ExtensionSystem::Get(profile_)->ready().Post(
-        FROM_HERE, base::Bind(&RuleStorageOnUI::CheckIfReady, GetWeakPtr()));
+        FROM_HERE, base::Bind(&RulesCacheDelegate::CheckIfReady, GetWeakPtr()));
     return;
   }
 
@@ -429,21 +190,22 @@ void RulesRegistryWithCache::RuleStorageOnUI::ReadFromStorage(
   if (!store)
     return;
   waiting_for_extensions_.insert(extension_id);
-  store->GetExtensionValue(extension_id,
-                           storage_key_,
-                           base::Bind(&RuleStorageOnUI::ReadFromStorageCallback,
-                                      weak_ptr_factory_.GetWeakPtr(),
-                                      extension_id));
+  store->GetExtensionValue(
+      extension_id,
+      storage_key_,
+      base::Bind(&RulesCacheDelegate::ReadFromStorageCallback,
+                 weak_ptr_factory_.GetWeakPtr(),
+                 extension_id));
 }
 
-void RulesRegistryWithCache::RuleStorageOnUI::ReadFromStorageCallback(
+void RulesCacheDelegate::ReadFromStorageCallback(
     const std::string& extension_id,
     scoped_ptr<base::Value> value) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   content::BrowserThread::PostTask(
       rules_registry_thread_,
       FROM_HERE,
-      base::Bind(&RulesRegistryWithCache::DeserializeAndAddRules,
+      base::Bind(&RulesRegistry::DeserializeAndAddRules,
                  registry_,
                  extension_id,
                  base::Passed(&value)));
@@ -452,10 +214,10 @@ void RulesRegistryWithCache::RuleStorageOnUI::ReadFromStorageCallback(
 
   if (waiting_for_extensions_.empty())
     ExtensionSystem::Get(profile_)->ready().Post(
-        FROM_HERE, base::Bind(&RuleStorageOnUI::CheckIfReady, GetWeakPtr()));
+        FROM_HERE, base::Bind(&RulesCacheDelegate::CheckIfReady, GetWeakPtr()));
 }
 
-bool RulesRegistryWithCache::RuleStorageOnUI::GetDeclarativeRulesStored(
+bool RulesCacheDelegate::GetDeclarativeRulesStored(
     const std::string& extension_id) const {
   CHECK(profile_);
   const ExtensionScopedPrefs* extension_prefs = ExtensionPrefs::Get(profile_);
@@ -470,7 +232,7 @@ bool RulesRegistryWithCache::RuleStorageOnUI::GetDeclarativeRulesStored(
   return true;
 }
 
-void RulesRegistryWithCache::RuleStorageOnUI::SetDeclarativeRulesStored(
+void RulesCacheDelegate::SetDeclarativeRulesStored(
     const std::string& extension_id,
     bool rules_stored) {
   CHECK(profile_);