Remove ContentRulesRegistry dependence from RulesRegistryService.

extensions/browser/api/extensions_api_client.h

 // Copyright 2014 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 EXTENSIONS_BROWSER_API_EXTENSIONS_API_CLIENT_H_
 #define EXTENSIONS_BROWSER_API_EXTENSIONS_API_CLIENT_H_
 
 #include <map>
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "extensions/browser/api/declarative/rules_registry.h"
 #include "extensions/browser/api/storage/settings_namespace.h"
 
 class GURL;
 
 template <class T>
 class ObserverListThreadSafe;
 
 namespace content {
 class BrowserContext;
 }
 
 namespace extensions {
 
 class AppViewGuestDelegate;
+class ContentRulesRegistry;
 class ExtensionOptionsGuest;
 class ExtensionOptionsGuestDelegate;
 class MimeHandlerViewGuest;
 class MimeHandlerViewGuestDelegate;
 class WebViewGuest;
 class WebViewGuestDelegate;
 class WebViewPermissionHelper;
 class WebViewPermissionHelperDelegate;
+class RulesCacheDelegate;
 class SettingsObserver;
 class SettingsStorageFactory;
 class ValueStoreCache;
 
 // Allows the embedder of the extensions module to customize its support for
 // API features. The embedder must create a single instance in the browser
 // process. Provides a default implementation that does nothing.
 class ExtensionsAPIClient {
  public:
   // Construction sets the single instance.
@@ skipping 38 matching lines @@
       CreateWebViewPermissionHelperDelegate (
           WebViewPermissionHelper* web_view_permission_helper) const;
 
   // TODO(wjmaclean): Remove this as soon as rules_registry_service.* moves to
   // extensions/browser/api/declarative/.
   virtual scoped_refptr<RulesRegistry> GetRulesRegistry(
       content::BrowserContext* browser_context,
       const RulesRegistry::WebViewKey& webview_key,
       const std::string& event_name);
 
+  // TODO(wjmaclean): Remove this when (if) ContentRulesRegistry code moves
+  // to extensions/browser/api.
+  virtual scoped_refptr<RulesRegistry> GetContentRulesRegistry(
+      content::BrowserContext* browser_context,
+      RulesCacheDelegate* cache_delegate) const;
+  virtual ContentRulesRegistry* ConvertToContentRulesRegistryPtr(

[Ken Rockot(use gerrit already), 2014/09/19 22:56:09]

I don't think this should be in ExtensionsAPIClient. How about just making a
static method on ContentRulesRegistry which can do this cast?

+      RulesRegistry* rules_registry) const;
+
   // NOTE: If this interface gains too many methods (perhaps more than 20) it
   // should be split into one interface per API.
 };
 
 }  // namespace extensions
 
 #endif  // EXTENSIONS_BROWSER_API_EXTENSIONS_API_CLIENT_H_