Remove WebViewKey in rules registry.

chrome/browser/extensions/api/declarative_content/chrome_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/chrome_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"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/web_contents.h"
+#include "extensions/browser/api/declarative/rules_registry_service.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/common/extension_messages.h"
 
 using url_matcher::URLMatcherConditionSet;
 
 namespace extensions {
 
 ChromeContentRulesRegistry::ChromeContentRulesRegistry(
     content::BrowserContext* browser_context,
     RulesCacheDelegate* cache_delegate)
     : ContentRulesRegistry(browser_context,
                            declarative_content_constants::kOnPageChanged,
                            content::BrowserThread::UI,
                            cache_delegate,
-                           WebViewKey(0, 0)) {
+                           RulesRegistryService::kDefaultRulesRegistryID) {
   extension_info_map_ = ExtensionSystem::Get(browser_context)->info_map();
 
   registrar_.Add(this,
                  content::NOTIFICATION_RENDERER_PROCESS_CREATED,
                  content::NotificationService::AllBrowserContextsAndSources());
   registrar_.Add(this,
                  content::NOTIFICATION_WEB_CONTENTS_DESTROYED,
                  content::NotificationService::AllBrowserContextsAndSources());
 }
 
@@ skipping 116 matching lines @@
   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(),
-                            browser_context(),
-                            extension,
-                            extension_installation_time,
-                            *rule,
-                            ContentRule::ConsistencyChecker(),
-                            &error));
+        ContentRule::Create(url_matcher_.condition_factory(), browser_context(),
+                            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;
     }
     DCHECK(content_rule);
 
     new_content_rules[rule_id] = make_linked_ptr(content_rule.release());
   }
 
@@ skipping 150 matching lines @@
 
 base::Time ChromeContentRulesRegistry::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