Refactor feedback to use native JS object

components/dom_distiller/content/browser/dom_distiller_viewer_source.cc

 // 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.
 
 #include "components/dom_distiller/content/browser/dom_distiller_viewer_source.h"
 
 #include <sstream>
 #include <string>
 #include <vector>
 
@@ skipping 184 matching lines @@
   CHECK_EQ(0, render_view_host->GetEnabledBindings());
 
   if (kViewerCssPath == path) {
     std::string css = viewer::GetCss();
     callback.Run(base::RefCountedString::TakeString(&css));
     return;
   } else if (kViewerViewOriginalPath == path) {
     content::RecordAction(base::UserMetricsAction("DomDistiller_ViewOriginal"));
     callback.Run(NULL);
     return;
-  } else if (kFeedbackBad == path) {
-    FeedbackReporter::ReportQuality(false);
-    callback.Run(NULL);
-    if (!external_feedback_reporter_)
-      return;
-    content::WebContents* contents =
-        content::WebContents::FromRenderFrameHost(render_frame_host);
-    external_feedback_reporter_->ReportExternalFeedback(
-        contents, contents->GetURL(), false);
-    return;
-  } else if (kFeedbackGood == path) {
-    FeedbackReporter::ReportQuality(true);
-    callback.Run(NULL);
-    return;
   }
   content::WebContents* web_contents =
       content::WebContents::FromRenderFrameHost(render_frame_host);
   DCHECK(web_contents);
   // An empty |path| is invalid, but guard against it. If not empty, assume
   // |path| starts with '?', which is stripped away.
   const std::string path_after_query_separator =
       path.size() > 0 ? path.substr(1) : "";
   RequestViewerHandle* request_viewer_handle =
       new RequestViewerHandle(web_contents, scheme_, path_after_query_separator,
                               dom_distiller_service_->GetDistilledPagePrefs());
   scoped_ptr<ViewerHandle> viewer_handle = viewer::CreateViewRequest(
       dom_distiller_service_, path, request_viewer_handle,
       web_contents->GetContainerBounds().size());
 
   GURL current_url(url_utils::GetValueForKeyInUrlPathQuery(path, kUrlKey));
   std::string unsafe_page_html = viewer::GetUnsafeArticleTemplateHtml(
       url_utils::GetOriginalUrlFromDistillerUrl(current_url).spec(),
       dom_distiller_service_->GetDistilledPagePrefs()->GetTheme(),
       dom_distiller_service_->GetDistilledPagePrefs()->GetFontFamily());
 
   // Add mojo service for JavaScript functionality. This is the receiving end
   // of this particular service.
   render_frame_host->GetServiceRegistry()->AddService(
-      base::Bind(&CreateDistillerJavaScriptService));
+      base::Bind(&CreateDistillerJavaScriptService,
+          render_frame_host,
+          external_feedback_reporter_.get()));
 
   // Tell the renderer that this is currently a distilled page.
   DistillerPageNotifierServicePtr page_notifier_service;
   render_frame_host->GetServiceRegistry()->ConnectToRemoteService(
       mojo::GetProxy(&page_notifier_service));
   DCHECK(page_notifier_service);
   page_notifier_service->NotifyIsDistillerPage();
 
   if (viewer_handle) {
     // The service returned a |ViewerHandle| and guarantees it will call
@@ skipping 34 matching lines @@
 std::string DomDistillerViewerSource::GetContentSecurityPolicyObjectSrc()
     const {
   return "object-src 'none'; style-src 'self' https://fonts.googleapis.com;";
 }
 
 std::string DomDistillerViewerSource::GetContentSecurityPolicyFrameSrc() const {
   return "frame-src *;";
 }
 
 }  // namespace dom_distiller