Add support for distilling arbitrary URLs in DOM Distiller Viewer.

components/dom_distiller/webui/dom_distiller_handler.cc

Index: components/dom_distiller/webui/dom_distiller_handler.cc
diff --git a/components/dom_distiller/webui/dom_distiller_handler.cc b/components/dom_distiller/webui/dom_distiller_handler.cc
index ede4f40615b78c919609e262ce382bb0c0809667..e66d06bcc85c38630148ed5cd144d0eb4ff10712 100644
--- a/components/dom_distiller/webui/dom_distiller_handler.cc
+++ b/components/dom_distiller/webui/dom_distiller_handler.cc
@@ -7,11 +7,15 @@
 #include <vector>
 
 #include "base/bind.h"
+#include "base/guid.h"

[shashi, 2014/02/27 04:29:08]

nit: is this import needed?

[shashi, 2014/02/27 04:29:08]

nit: is this import needed?

[nyquist, 2014/02/27 19:50:19]

Done.

 #include "base/values.h"
 #include "components/dom_distiller/core/dom_distiller_service.h"
 #include "components/dom_distiller/core/proto/distilled_page.pb.h"
+#include "components/dom_distiller/core/url_constants.h"

[shashi, 2014/02/27 04:29:08]

nit: is this import needed?

[shashi, 2014/02/27 04:29:08]

nit: is this import needed?

[nyquist, 2014/02/27 19:50:19]

Done.

+#include "components/dom_distiller/core/url_utils.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui.h"
+#include "net/base/escape.h"
 #include "url/gurl.h"
 
 namespace dom_distiller {
@@ -35,6 +39,9 @@ void DomDistillerHandler::RegisterMessages() {
       "selectArticle",
       base::Bind(&DomDistillerHandler::HandleSelectArticle,
                  base::Unretained(this)));
+  web_ui()->RegisterMessageCallback(
+      "viewUrl",
+      base::Bind(&DomDistillerHandler::HandleViewUrl, base::Unretained(this)));
 }
 
 void DomDistillerHandler::HandleAddArticle(const base::ListValue* args) {
@@ -51,13 +58,34 @@ void DomDistillerHandler::HandleAddArticle(const base::ListValue* args) {
   }
 }
 
+void DomDistillerHandler::HandleViewUrl(const base::ListValue* args) {
+  std::string url;
+  args->GetString(0, &url);
+  const GURL gurl(url);
+  if (gurl.is_valid()) {
+    GURL view_url =
+        url_utils::GetDistillerViewUrlFromUrl(article_scheme_, gurl);
+    DCHECK(view_url.is_valid());

[shashi, 2014/02/27 04:29:08]

nit: should it be DCHECK(url_utils::IsDistillableUrl(view_url))?

[nyquist, 2014/02/27 19:50:19]

It should be that on the check of gurl above. This URL is just the one we
create. Thanks!

+    web_ui()->GetWebContents()->GetController().LoadURL(
+        view_url,
+        content::Referrer(),
+        content::PAGE_TRANSITION_GENERATED,
+        std::string());
+  } else {
+    web_ui()->CallJavascriptFunction("domDistiller.onViewUrlFailed");
+  }
+}
+
 void DomDistillerHandler::HandleSelectArticle(const base::ListValue* args) {
   std::string entry_id;
   args->GetString(0, &entry_id);
-  GURL url(article_scheme_ + std::string("://") + entry_id);
+  GURL url =
+      url_utils::GetDistillerViewUrlFromEntryId(article_scheme_, entry_id);
   DCHECK(url.is_valid());
-  web_ui()->GetWebContents()->GetController().LoadURL(url,
-      content::Referrer(), content::PAGE_TRANSITION_GENERATED,
+  web_ui()->GetWebContents()->GetController().LoadURL(
+      url,
+      content::Referrer(),
+      content::PAGE_TRANSITION_GENERATED,
       std::string());
 }
 
@@ -74,7 +102,7 @@ void DomDistillerHandler::HandleRequestEntries(const base::ListValue* args) {
     std::string title = (!article.has_title() || article.title().empty())
                             ? article.entry_id()
                             : article.title();
-    entry->SetString("title", title);
+    entry->SetString("title", net::EscapeForHTML(title));

[shashi, 2014/02/27 04:29:08]

Is there a unit test somewhere to test all values that we display under
chrome-distiller are actually escaped?. Like initialize a mock service with
article : { 'title': "<javascript> alert('foo'); </javascript>", 'html' : }

Note: you do not need to add this test in the current CL.

[nyquist, 2014/02/27 19:50:19]

Good suggestion. I'll add a TODO for that.

     entries.Append(entry.release());
   }
   web_ui()->CallJavascriptFunction("domDistiller.onReceivedEntries", entries);