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

chrome/browser/ui/webui/engagement/site_engagement_ui.cc

 // Copyright 2015 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.
 
 #include "chrome/browser/ui/webui/engagement/site_engagement_ui.h"
 
 #include "chrome/browser/engagement/site_engagement_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/web_ui.h"
@@ skipping 52 matching lines @@
   // Set up the chrome://site-engagement/ source.
   scoped_ptr<content::WebUIDataSource> source(
       content::WebUIDataSource::Create(chrome::kChromeUISiteEngagementHost));
   source->AddResourcePath("engagement_table.html",
                           IDR_SITE_ENGAGEMENT_ENGAGEMENT_TABLE_HTML);
   source->AddResourcePath("engagement_table.css",
                           IDR_SITE_ENGAGEMENT_ENGAGEMENT_TABLE_CSS);
   source->AddResourcePath("engagement_table.js",
                           IDR_SITE_ENGAGEMENT_ENGAGEMENT_TABLE_JS);
   source->AddResourcePath("site_engagement.js", IDR_SITE_ENGAGEMENT_JS);
-  source->AddResourcePath(
-      "chrome/browser/ui/webui/engagement/site_engagement.mojom",
-      IDR_SITE_ENGAGEMENT_MOJO_JS);
-  source->AddMojoResources();
   source->SetDefaultResource(IDR_SITE_ENGAGEMENT_HTML);
 
   content::WebUIDataSource::Add(Profile::FromWebUI(web_ui), source.release());
+
+  AddMojoResourcePath(
+      "chrome/browser/ui/webui/engagement/site_engagement.mojom",
+      IDR_SITE_ENGAGEMENT_MOJO_JS);
 }
 
 SiteEngagementUI::~SiteEngagementUI() {}
 
 void SiteEngagementUI::BindUIHandler(
     mojo::InterfaceRequest<SiteEngagementUIHandler> request) {
   // SiteEngagementUIHandlerImpl deletes itself when the pipe is closed.
   new SiteEngagementUIHandlerImpl(Profile::FromWebUI(web_ui()), request.Pass());
 }