Clean up of url data manager classes in content: move URLDataSourceImpl to its own file, move all t…

content/browser/webui/web_ui_data_source_impl.cc

Index: content/browser/webui/web_ui_data_source_impl.cc
===================================================================
--- content/browser/webui/web_ui_data_source_impl.cc	(revision 179094)
+++ content/browser/webui/web_ui_data_source_impl.cc	(working copy)
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/browser/webui/web_ui_data_source.h"
+#include "content/browser/webui/web_ui_data_source_impl.h"
 
 #include <string>
 
@@ -16,28 +16,25 @@
 namespace content {
 
 WebUIDataSource* WebUIDataSource::Create(const std::string& source_name) {
-  return new ChromeWebUIDataSource(source_name);
+  return new WebUIDataSourceImpl(source_name);
 }
 
 void WebUIDataSource::Add(BrowserContext* browser_context,
                           WebUIDataSource* source) {
-  ChromeURLDataManager::AddWebUIDataSource(browser_context, source);
+  URLDataManager::AddWebUIDataSource(browser_context, source);
 }
 
-}  // namespace content
-
-// Internal class to hide the fact that ChromeWebUIDataSource implements
-// content::URLDataSource.
-class ChromeWebUIDataSource::InternalDataSource
-    : public content::URLDataSource {
+// Internal class to hide the fact that WebUIDataSourceImpl implements
+// URLDataSource.
+class WebUIDataSourceImpl::InternalDataSource : public URLDataSource {
  public:
-  InternalDataSource(ChromeWebUIDataSource* parent) : parent_(parent) {
+  InternalDataSource(WebUIDataSourceImpl* parent) : parent_(parent) {
   }
 
   ~InternalDataSource() {
   }
 
-  // content::URLDataSource implementation.
+  // URLDataSource implementation.
   virtual std::string GetSource() OVERRIDE {
     return parent_->GetSource();
   }
@@ -47,7 +44,7 @@
   virtual void StartDataRequest(
       const std::string& path,
       bool is_incognito,
-      const content::URLDataSource::GotDataCallback& callback) OVERRIDE {
+      const URLDataSource::GotDataCallback& callback) OVERRIDE {
     return parent_->StartDataRequest(path, is_incognito, callback);
   }
   virtual bool ShouldAddContentSecurityPolicy() const OVERRIDE {
@@ -56,22 +53,22 @@
   virtual std::string GetContentSecurityPolicyObjectSrc() const OVERRIDE {
     if (parent_->object_src_set_)
       return parent_->object_src_;
-    return content::URLDataSource::GetContentSecurityPolicyObjectSrc();
+    return URLDataSource::GetContentSecurityPolicyObjectSrc();
   }
   virtual std::string GetContentSecurityPolicyFrameSrc() const OVERRIDE {
     if (parent_->frame_src_set_)
       return parent_->frame_src_;
-    return content::URLDataSource::GetContentSecurityPolicyFrameSrc();
+    return URLDataSource::GetContentSecurityPolicyFrameSrc();
   }
   virtual bool ShouldDenyXFrameOptions() const OVERRIDE {
     return parent_->deny_xframe_options_;
   }
 
  private:
-  ChromeWebUIDataSource* parent_;
+  WebUIDataSourceImpl* parent_;
 };
 
-ChromeWebUIDataSource::ChromeWebUIDataSource(const std::string& source_name)
+WebUIDataSourceImpl::WebUIDataSourceImpl(const std::string& source_name)
     : URLDataSourceImpl(
           source_name,
           new InternalDataSource(ALLOW_THIS_IN_INITIALIZER_LIST(this))),
@@ -85,81 +82,81 @@
       disable_set_font_strings_(false) {
 }
 
-ChromeWebUIDataSource::~ChromeWebUIDataSource() {
+WebUIDataSourceImpl::~WebUIDataSourceImpl() {
 }
 
-void ChromeWebUIDataSource::AddString(const std::string& name,
-                                      const string16& value) {
+void WebUIDataSourceImpl::AddString(const std::string& name,
+                                    const string16& value) {
   localized_strings_.SetString(name, value);
 }
 
-void ChromeWebUIDataSource::AddString(const std::string& name,
-                                      const std::string& value) {
+void WebUIDataSourceImpl::AddString(const std::string& name,
+                                    const std::string& value) {
   localized_strings_.SetString(name, value);
 }
 
-void ChromeWebUIDataSource::AddLocalizedString(const std::string& name,
-                                               int ids) {
+void WebUIDataSourceImpl::AddLocalizedString(const std::string& name,
+                                             int ids) {
   localized_strings_.SetString(
-      name, content::GetContentClient()->GetLocalizedString(ids));
+      name, GetContentClient()->GetLocalizedString(ids));
 }
 
-void ChromeWebUIDataSource::AddLocalizedStrings(
+void WebUIDataSourceImpl::AddLocalizedStrings(
     const DictionaryValue& localized_strings) {
   localized_strings_.MergeDictionary(&localized_strings);
 }
 
-void ChromeWebUIDataSource::AddBoolean(const std::string& name, bool value) {
+void WebUIDataSourceImpl::AddBoolean(const std::string& name, bool value) {
   localized_strings_.SetBoolean(name, value);
 }
 
-void ChromeWebUIDataSource::SetJsonPath(const std::string& path) {
+void WebUIDataSourceImpl::SetJsonPath(const std::string& path) {
   json_path_ = path;
 }
 
-void ChromeWebUIDataSource::SetUseJsonJSFormatV2() {
+void WebUIDataSourceImpl::SetUseJsonJSFormatV2() {
   json_js_format_v2_ = true;
 }
 
-void ChromeWebUIDataSource::AddResourcePath(const std::string &path,
-                                            int resource_id) {
+void WebUIDataSourceImpl::AddResourcePath(const std::string &path,
+                                          int resource_id) {
   path_to_idr_map_[path] = resource_id;
 }
 
-void ChromeWebUIDataSource::SetDefaultResource(int resource_id) {
+void WebUIDataSourceImpl::SetDefaultResource(int resource_id) {
   default_resource_ = resource_id;
 }
 
-void ChromeWebUIDataSource::SetRequestFilter(
-    const content::WebUIDataSource::HandleRequestCallback& callback) {
+void WebUIDataSourceImpl::SetRequestFilter(
+    const WebUIDataSource::HandleRequestCallback& callback) {
   filter_callback_ = callback;
 }
 
-void ChromeWebUIDataSource::DisableContentSecurityPolicy() {
+void WebUIDataSourceImpl::DisableContentSecurityPolicy() {
   add_csp_ = false;
 }
 
-void ChromeWebUIDataSource::OverrideContentSecurityPolicyObjectSrc(
+void WebUIDataSourceImpl::OverrideContentSecurityPolicyObjectSrc(
     const std::string& data) {
   object_src_set_ = true;
   object_src_ = data;
 }
 
-void ChromeWebUIDataSource::OverrideContentSecurityPolicyFrameSrc(
+void WebUIDataSourceImpl::OverrideContentSecurityPolicyFrameSrc(
     const std::string& data) {
   frame_src_set_ = true;
   frame_src_ = data;
 }
 
-void ChromeWebUIDataSource::DisableDenyXFrameOptions() {
+void WebUIDataSourceImpl::DisableDenyXFrameOptions() {
   deny_xframe_options_ = false;
 }
 
-std::string ChromeWebUIDataSource::GetSource() {
+std::string WebUIDataSourceImpl::GetSource() {
   return source_name_;
 }
 
-std::string ChromeWebUIDataSource::GetMimeType(const std::string& path) const {
+std::string WebUIDataSourceImpl::GetMimeType(const std::string& path) const {
   if (EndsWith(path, ".js", false))
     return "application/javascript";
 
@@ -172,10 +169,10 @@
   return "text/html";
 }
 
-void ChromeWebUIDataSource::StartDataRequest(
+void WebUIDataSourceImpl::StartDataRequest(
     const std::string& path,
     bool is_incognito,
-    const content::URLDataSource::GotDataCallback& callback) {
+    const URLDataSource::GotDataCallback& callback) {
   if (!filter_callback_.is_null() &&
       filter_callback_.Run(path, callback)) {
     return;
@@ -195,8 +192,8 @@
   SendFromResourceBundle(callback, resource_id);
 }
 
-void ChromeWebUIDataSource::SendLocalizedStringsAsJSON(
-    const content::URLDataSource::GotDataCallback& callback) {
+void WebUIDataSourceImpl::SendLocalizedStringsAsJSON(
+    const URLDataSource::GotDataCallback& callback) {
   std::string template_data;
   if (!disable_set_font_strings_)
     webui::SetFontAndTextDirection(&localized_strings_);
@@ -209,9 +206,11 @@
   callback.Run(base::RefCountedString::TakeString(&template_data));
 }
 
-void ChromeWebUIDataSource::SendFromResourceBundle(
-    const content::URLDataSource::GotDataCallback& callback, int idr) {
+void WebUIDataSourceImpl::SendFromResourceBundle(
+    const URLDataSource::GotDataCallback& callback, int idr) {
   scoped_refptr<base::RefCountedStaticMemory> response(
-      content::GetContentClient()->GetDataResourceBytes(idr));
+      GetContentClient()->GetDataResourceBytes(idr));
   callback.Run(response);
 }
+
+}  // namespace content