Refactor RulesRegistryWithCache to RulesRegistry

chrome/browser/extensions/api/declarative/test_rules_registry.h

 // 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_API_DECLARATIVE_TEST_RULES_REGISTRY_H__
 #define CHROME_BROWSER_EXTENSIONS_API_DECLARATIVE_TEST_RULES_REGISTRY_H__
 
-#include "chrome/browser/extensions/api/declarative/rules_registry_with_cache.h"
+#include "chrome/browser/extensions/api/declarative/rules_registry.h"
 
 namespace extensions {
 
 // This is a trivial test RulesRegistry that can only store and retrieve rules.
-class TestRulesRegistry : public RulesRegistryWithCache {
+class TestRulesRegistry : public RulesRegistry {
  public:
   TestRulesRegistry(content::BrowserThread::ID owner_thread,
                     const std::string& event_name);
   TestRulesRegistry(
       Profile* profile,
       const std::string& event_name,
       content::BrowserThread::ID owner_thread,
-      scoped_ptr<RulesRegistryWithCache::RuleStorageOnUI>* ui_part);
+      scoped_ptr<RulesCacheDelegate>* ui_part);
 
-  // RulesRegistryWithCache implementation:
+  // RulesRegistry implementation:
   virtual std::string AddRulesImpl(
       const std::string& extension_id,
       const std::vector<linked_ptr<RulesRegistry::Rule> >& rules) OVERRIDE;
   virtual std::string RemoveRulesImpl(
       const std::string& extension_id,
       const std::vector<std::string>& rule_identifiers) OVERRIDE;
   virtual std::string RemoveAllRulesImpl(
       const std::string& extension_id) OVERRIDE;
 
   // Sets the result message that will be returned by the next call of
   // AddRulesImpl, RemoveRulesImpl and RemoveAllRulesImpl.
   void SetResult(const std::string& result);
 
  protected:
   virtual ~TestRulesRegistry();
 
  private:
   // The string that gets returned by the implementation functions of
-  // RulesRegistryWithCache. Defaults to "".
+  // RulesRegistry. Defaults to "".
   std::string result_;
 
   DISALLOW_COPY_AND_ASSIGN(TestRulesRegistry);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_API_DECLARATIVE_TEST_RULES_REGISTRY_H__