Remove WebViewKey in rules registry.

extensions/browser/api/declarative/rules_registry_unittest.cc

 // 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 "extensions/browser/api/declarative/rules_registry.h"
 
 #include <algorithm>
 
 #include "base/message_loop/message_loop.h"
 #include "content/public/test/test_browser_thread.h"
+#include "extensions/browser/api/declarative/rules_registry_service.h"
 #include "extensions/browser/api/declarative/test_rules_registry.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 const char kExtensionId[] = "foobar";
 const char kRuleId[] = "foo";
+const int key = extensions::RulesRegistryService::kDefultRulesRegistryID;

[Fady Samuel, 2014/11/26 23:39:41]

kDefaultRulesRegistryID

 }  // namespace
 
 namespace extensions {
 
 TEST(RulesRegistryTest, FillOptionalIdentifiers) {
   base::MessageLoopForUI message_loop;
   content::TestBrowserThread thread(content::BrowserThread::UI, &message_loop);
 
-  const RulesRegistry::WebViewKey key(0, 0);
   std::string error;
   scoped_refptr<RulesRegistry> registry =
       new TestRulesRegistry(content::BrowserThread::UI, "" /*event_name*/, key);
 
   // Add rules and check that their identifiers are filled and unique.
 
   std::vector<linked_ptr<RulesRegistry::Rule> > add_rules;
   add_rules.push_back(make_linked_ptr(new RulesRegistry::Rule));
   add_rules.push_back(make_linked_ptr(new RulesRegistry::Rule));
   error = registry->AddRules(kExtensionId, add_rules);
@@ skipping 89 matching lines @@
 
   // Make sure that deletion traits of registry are executed.
   registry = NULL;
   message_loop.RunUntilIdle();
 }
 
 TEST(RulesRegistryTest, FillOptionalPriority) {
   base::MessageLoopForUI message_loop;
   content::TestBrowserThread thread(content::BrowserThread::UI, &message_loop);
 
-  const RulesRegistry::WebViewKey key(0, 0);
   std::string error;
   scoped_refptr<RulesRegistry> registry =
       new TestRulesRegistry(content::BrowserThread::UI, "" /*event_name*/, key);
 
   // Add rules and check that their priorities are filled if they are empty.
 
   std::vector<linked_ptr<RulesRegistry::Rule> > add_rules;
   add_rules.push_back(make_linked_ptr(new RulesRegistry::Rule));
   add_rules[0]->priority.reset(new int(2));
   add_rules.push_back(make_linked_ptr(new RulesRegistry::Rule));
@@ skipping 13 matching lines @@
   EXPECT_EQ(2, std::min(*get_rules[0]->priority, *get_rules[1]->priority));
   EXPECT_EQ(RulesRegistry::DEFAULT_PRIORITY,
             std::max(*get_rules[0]->priority, *get_rules[1]->priority));
 
   // Make sure that deletion traits of registry are executed.
   registry = NULL;
   message_loop.RunUntilIdle();
 }
 
 }  // namespace extensions