Revert of Serve mojo WebUI resources from the same origin as the WebUI itself.

content/public/browser/web_ui_data_source.h

 // Copyright (c) 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.
 
 #ifndef CONTENT_PUBLIC_BROWSER_WEB_UI_DATA_SOURCE_H_
 #define CONTENT_PUBLIC_BROWSER_WEB_UI_DATA_SOURCE_H_
 
 #include "base/callback.h"
 #include "base/strings/string16.h"
 #include "content/common/content_export.h"
 
 namespace base {
 class DictionaryValue;
 class RefCountedMemory;
 }
 
 namespace content {
 class BrowserContext;
 
 // A data source that can help with implementing the common operations needed by
 // WebUI pages.
 class WebUIDataSource {
  public:
   virtual ~WebUIDataSource() {}
 
   CONTENT_EXPORT static WebUIDataSource* Create(const std::string& source_name);
 
+  // Adds the necessary resources for mojo bindings returning the
+  // WebUIDataSource that handles the resources. Callers do not own the return
+  // value.
+  CONTENT_EXPORT static WebUIDataSource* AddMojoDataSource(
+      BrowserContext* browser_context);
+
   // Adds a WebUI data source to |browser_context|.
   CONTENT_EXPORT static void Add(BrowserContext* browser_context,
                                  WebUIDataSource* source);
 
   // Adds a string keyed to its name to our dictionary.
   virtual void AddString(const std::string& name,
                          const base::string16& value) = 0;
 
   // Adds a string keyed to its name to our dictionary.
   virtual void AddString(const std::string& name, const std::string& value) = 0;
@@ skipping 26 matching lines @@
   // Used by SetRequestFilter. The string parameter is the path of the request.
   // If the callee doesn't want to handle the data, false is returned. Otherwise
   // true is returned and the GotDataCallback parameter is called either then or
   // asynchronously with the response.
   typedef base::Callback<bool(const std::string&, const GotDataCallback&)>
       HandleRequestCallback;
 
   // Allows a caller to add a filter for URL requests.
   virtual void SetRequestFilter(const HandleRequestCallback& callback) = 0;
 
-  // Adds the necessary resources for mojo bindings.
-  virtual void AddMojoResources() = 0;
-
   // The following map to methods on URLDataSource. See the documentation there.
   // NOTE: it's not acceptable to call DisableContentSecurityPolicy for new
   // pages, see URLDataSource::ShouldAddContentSecurityPolicy and talk to
   // tsepez.
 
   // Currently only used by embedders for WebUIs with multiple instances.
   virtual void DisableReplaceExistingSource() = 0;
   virtual void DisableContentSecurityPolicy() = 0;
   virtual void OverrideContentSecurityPolicyObjectSrc(
       const std::string& data) = 0;
   virtual void OverrideContentSecurityPolicyFrameSrc(
       const std::string& data) = 0;
   virtual void DisableDenyXFrameOptions() = 0;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_BROWSER_WEB_UI_DATA_SOURCE_H_