Remove //chrome dependency from ExtensionPrefs

chrome/browser/extensions/api/content_settings/content_settings_service.h

Index: chrome/browser/extensions/api/content_settings/content_settings_service.h
diff --git a/chrome/browser/extensions/api/content_settings/content_settings_service.h b/chrome/browser/extensions/api/content_settings/content_settings_service.h
new file mode 100644
index 0000000000000000000000000000000000000000..4479aa3cce793de4f55ef7a0cf6351d5e3066a04
--- /dev/null
+++ b/chrome/browser/extensions/api/content_settings/content_settings_service.h
@@ -0,0 +1,65 @@
+// 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 CHROME_BROWSER_EXTENSIONS_API_CONTENT_SETTINGS_CONTENT_SETTINGS_SERVICE_H_
+#define CHROME_BROWSER_EXTENSIONS_API_CONTENT_SETTINGS_CONTENT_SETTINGS_SERVICE_H_
+
+#include "base/memory/ref_counted.h"
+#include "extensions/browser/browser_context_keyed_api_factory.h"
+#include "extensions/browser/extension_prefs.h"
+
+namespace extensions {
+
+class ContentSettingsStore;
+
+// This service hosts a single ContentSettingsStore for the
+// chrome.contentSettings API.
+class ContentSettingsService : public BrowserContextKeyedAPI,
+                               public ExtensionPrefs::Observer {
+ public:
+  explicit ContentSettingsService(content::BrowserContext* context);
+  virtual ~ContentSettingsService();
+
+  scoped_refptr<ContentSettingsStore> content_settings_store() const {
+    return content_settings_store_;
+  }
+
+  // Convenience function to get the service for some browser context.
+  static ContentSettingsService* Get(content::BrowserContext* context);
+
+  // BrowserContextKeyedAPI implementation.
+  static BrowserContextKeyedAPIFactory<ContentSettingsService>*

[James Cook, 2014/04/01 18:45:03]

Can this go in the private section below?

[Ken Rockot(use gerrit already), 2014/04/01 21:34:59]

Is this comment on the right line? GetFactoryInstance can't be private.

+      GetFactoryInstance();
+
+  // ExtensionPrefs::Observer implementation
+  virtual void OnExtensionRegistered(const std::string& extension_id,
+                                     const base::Time& install_time,
+                                     bool is_enabled) OVERRIDE;
+  virtual void OnExtensionPrefsLoaded(const std::string& extension_id,
+                                      const ExtensionPrefs* prefs) OVERRIDE;
+  virtual void OnExtensionPrefsDeleted(const std::string& extension_id)
+      OVERRIDE;
+  virtual void OnExtensionStateChanged(const std::string& extension_id,
+                                       bool state) OVERRIDE;
+
+ private:
+  friend class BrowserContextKeyedAPIFactory<ContentSettingsService>;
+
+  // BrowserContextKeyedAPI implementation.
+  static const char* service_name() { return "ContentSettingsService"; }
+  static const bool kServiceHasOwnInstanceInIncognito = true;

[James Cook, 2014/04/01 18:45:03]

Are you sure this is right? It looks like ExtensionPrefs is redirected in
incognito, so wouldn't that mean there is a shared ContentSettingsStore for
master and incognito?

[Ken Rockot(use gerrit already), 2014/04/01 21:34:59]

You're right. Fixed.

+  static const bool kServiceIsNULLWhileTesting = false;
+
+  scoped_refptr<ContentSettingsStore> content_settings_store_;
+
+  DISALLOW_COPY_AND_ASSIGN(ContentSettingsService);
+};
+
+template <>
+void BrowserContextKeyedAPIFactory<
+    ContentSettingsService>::DeclareFactoryDependencies();
+
+}  // namespace extensions
+
+#endif  // CHROME_BROWSER_EXTENSIONS_API_CONTENT_SETTINGS_CONTENT_SETTINGS_SERVICE_H_