Refactor RulesRegistryWithCache to RulesRegistry

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

Index: chrome/browser/extensions/api/declarative/rules_registry.cc
diff --git a/chrome/browser/extensions/api/declarative/rules_registry.cc b/chrome/browser/extensions/api/declarative/rules_registry.cc
new file mode 100644
index 0000000000000000000000000000000000000000..675ba8fd68e1fff8c09f5d5d2a3aa209fbfe09dc
--- /dev/null
+++ b/chrome/browser/extensions/api/declarative/rules_registry.cc
@@ -0,0 +1,354 @@
+// 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/api/declarative/rules_registry.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_cache_delegate.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;
+}
+
+std::string ToId(int identifier) {
+  return base::StringPrintf("_%d_", identifier);
+}
+
+}  // namespace
+
+
+namespace extensions {
+
+// RulesRegistry
+
+RulesRegistry::RulesRegistry(
+    Profile* profile,
+    const std::string& event_name,
+    content::BrowserThread::ID owner_thread,
+    bool log_storage_init_delay,
+    scoped_ptr<RulesCacheDelegate>* ui_part)
+    : owner_thread_(owner_thread),
+      event_name_(event_name),
+      weak_ptr_factory_(profile ? this : NULL),
+      cache_delegate_(
+          (profile ? (new RulesCacheDelegate(profile,
+                                          event_name,
+                                          owner_thread,
+                                          weak_ptr_factory_.GetWeakPtr(),
+                                          log_storage_init_delay))->GetWeakPtr()
+                   : base::WeakPtr<RulesCacheDelegate>())),
+      process_changed_rules_requested_(profile ? NOT_SCHEDULED_FOR_PROCESSING
+                                               : NEVER_PROCESS),
+      last_generated_rule_identifier_id_(0) {
+  if (!profile) {
+    CHECK(!ui_part);
+    return;
+  }
+
+  ui_part->reset(cache_delegate_.get());
+
+  cache_delegate_->Init();
+}
+
+std::string RulesRegistry::AddRules(
+    const std::string& extension_id,
+    const std::vector<linked_ptr<Rule> >& rules) {
+  DCHECK(content::BrowserThread::CurrentlyOn(owner_thread()));
+
+  std::string error = CheckAndFillInOptionalRules(extension_id, rules);
+  if (!error.empty())
+    return error;
+  FillInOptionalPriorities(rules);
+
+  // 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());
+  }
+
+  error = AddRulesImpl(extension_id, rules);
+
+  if (!error.empty())
+    return error;
+
+  // Commit all rules into |rules_| on success.

[vabr (Chromium), 2013/10/29 16:05:54]

This is one of the parts when the rules caching code stays in the RulesRegistry,
and should be pulled out in the next step. It would be good to add TODOs to
those parts to make it clear that these parts would be moved soon.

+  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 RulesRegistry::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);
+  RemoveUsedRuleIdentifiers(extension_id, rule_identifiers);
+  return kSuccess;
+}
+
+std::string RulesRegistry::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);
+  RemoveAllUsedRuleIdentifiers(extension_id);
+  return kSuccess;
+}
+
+std::string RulesRegistry::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 RulesRegistry::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 RulesRegistry::OnExtensionUnloaded(const std::string& extension_id) {
+  DCHECK(content::BrowserThread::CurrentlyOn(owner_thread()));
+  std::string error = RemoveAllRules(extension_id);
+  if (!error.empty())
+    LOG(ERROR) << error;
+  used_rule_identifiers_.erase(extension_id);
+}
+
+size_t RulesRegistry::GetNumberOfUsedRuleIdentifiersForTesting() const {
+  size_t entry_count = 0u;
+  for (RuleIdentifiersMap::const_iterator extension =
+           used_rule_identifiers_.begin();
+       extension != used_rule_identifiers_.end();
+       ++extension) {
+    // Each extension is counted as 1 just for being there. Otherwise we miss
+    // keys with empty values.
+    entry_count += 1u + extension->second.size();
+  }
+  return entry_count;
+}
+
+RulesRegistry::~RulesRegistry() {
+}
+
+void RulesRegistry::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 RulesRegistry::DeserializeAndAddRules(
+    const std::string& extension_id,
+    scoped_ptr<base::Value> rules) {
+  DCHECK(content::BrowserThread::CurrentlyOn(owner_thread()));
+
+  AddRules(extension_id, RulesFromValue(rules.get()));
+}
+
+void RulesRegistry::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(&RulesCacheDelegate::WriteToStorage,
+                 cache_delegate_,
+                 extension_id,
+                 base::Passed(RulesToValue(new_rules))));
+}
+
+void RulesRegistry::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(&RulesRegistry::ProcessChangedRules,
+                         weak_ptr_factory_.GetWeakPtr(),
+                         extension_id));
+}
+
+bool RulesRegistry::IsUniqueId(const std::string& extension_id,
+                               const std::string& rule_id) const {
+  RuleIdentifiersMap::const_iterator identifiers =
+      used_rule_identifiers_.find(extension_id);
+  if (identifiers == used_rule_identifiers_.end())
+    return true;
+  return identifiers->second.find(rule_id) == identifiers->second.end();
+}
+
+std::string RulesRegistry::GenerateUniqueId(const std::string& extension_id) {
+  while (!IsUniqueId(extension_id, ToId(last_generated_rule_identifier_id_)))
+    ++last_generated_rule_identifier_id_;
+  return ToId(last_generated_rule_identifier_id_);
+}
+
+std::string RulesRegistry::CheckAndFillInOptionalRules(
+    const std::string& extension_id,
+    const std::vector<linked_ptr<RulesRegistry::Rule> >& rules) {
+  // IDs we have inserted, in case we need to rollback this operation.
+  std::vector<std::string> rollback_log;
+
+  // First we insert all rules with existing identifier, so that generated
+  // identifiers cannot collide with identifiers passed by the caller.
+  for (std::vector<linked_ptr<RulesRegistry::Rule> >::const_iterator i =
+      rules.begin(); i != rules.end(); ++i) {
+    RulesRegistry::Rule* rule = i->get();
+    if (rule->id.get()) {
+      std::string id = *(rule->id);
+      if (!IsUniqueId(extension_id, id)) {
+        RemoveUsedRuleIdentifiers(extension_id, rollback_log);
+        return "Id " + id + " was used multiple times.";
+      }
+      used_rule_identifiers_[extension_id].insert(id);
+    }
+  }
+  // Now we generate IDs in case they were not specificed in the rules. This
+  // cannot fail so we do not need to keep track of a rollback log.
+  for (std::vector<linked_ptr<RulesRegistry::Rule> >::const_iterator i =
+      rules.begin(); i != rules.end(); ++i) {
+    RulesRegistry::Rule* rule = i->get();
+    if (!rule->id.get()) {
+      rule->id.reset(new std::string(GenerateUniqueId(extension_id)));
+      used_rule_identifiers_[extension_id].insert(*(rule->id));
+    }
+  }
+  return std::string();
+}
+
+void RulesRegistry::FillInOptionalPriorities(
+    const std::vector<linked_ptr<RulesRegistry::Rule> >& rules) {
+  std::vector<linked_ptr<RulesRegistry::Rule> >::const_iterator i;
+  for (i = rules.begin(); i != rules.end(); ++i) {
+    if (!(*i)->priority.get())
+      (*i)->priority.reset(new int(DEFAULT_PRIORITY));
+  }
+}
+
+void RulesRegistry::RemoveUsedRuleIdentifiers(
+    const std::string& extension_id,
+    const std::vector<std::string>& identifiers) {
+  std::vector<std::string>::const_iterator i;
+  for (i = identifiers.begin(); i != identifiers.end(); ++i)
+    used_rule_identifiers_[extension_id].erase(*i);
+}
+
+void RulesRegistry::RemoveAllUsedRuleIdentifiers(
+    const std::string& extension_id) {
+  used_rule_identifiers_.erase(extension_id);
+}
+
+}  // namespace extensions