Browser changes for wiring up RequestContentScript API to shared memory

chrome/browser/extensions/api/declarative_content/content_rules_registry.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/api/declarative_content/content_rules_registry.h"
 
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/api/declarative_content/content_action.h"
 #include "chrome/browser/extensions/api/declarative_content/content_condition.h"
 #include "chrome/browser/extensions/api/declarative_content/content_constants.h"
@@ skipping 64 matching lines @@
     return;
 
   std::set<ContentRule*>& prev_matching_rules = active_rules_[tab_id];
   ContentAction::ApplyInfo apply_info = {
     profile(), contents
   };
   for (std::set<ContentRule*>::const_iterator it = matching_rules.begin();
        it != matching_rules.end(); ++it) {
     if (!ContainsKey(prev_matching_rules, *it))
       (*it)->actions().Apply((*it)->extension_id(), base::Time(), &apply_info);
+    else
+      (*it)->actions().Reapply((*it)->extension_id(),
+                               base::Time(),
+                               &apply_info);
   }
   for (std::set<ContentRule*>::const_iterator it = prev_matching_rules.begin();
        it != prev_matching_rules.end(); ++it) {
     if (!ContainsKey(matching_rules, *it))
       (*it)->actions().Revert((*it)->extension_id(), base::Time(), &apply_info);
   }
 
   if (matching_rules.empty())
     active_rules_.erase(tab_id);
   else
@@ skipping 54 matching lines @@
   std::string error;
   RulesMap new_content_rules;
 
   for (std::vector<linked_ptr<RulesRegistry::Rule> >::const_iterator rule =
        rules.begin(); rule != rules.end(); ++rule) {
     ContentRule::GlobalRuleId rule_id(extension_id, *(*rule)->id);
     DCHECK(content_rules_.find(rule_id) == content_rules_.end());
 
     scoped_ptr<ContentRule> content_rule(
         ContentRule::Create(url_matcher_.condition_factory(),
+                            profile(),
                             extension,
                             extension_installation_time,
                             *rule,
                             ContentRule::ConsistencyChecker(),
                             &error));
     if (!error.empty()) {
       // Clean up temporary condition sets created during rule creation.
       url_matcher_.ClearUnusedConditionSets();
       return error;
     }
@@ skipping 143 matching lines @@
 
 base::Time ContentRulesRegistry::GetExtensionInstallationTime(
     const std::string& extension_id) const {
   if (!extension_info_map_.get())  // May be NULL during testing.
     return base::Time();
 
   return extension_info_map_->GetInstallTime(extension_id);
 }
 
 }  // namespace extensions