Add support for distilling arbitrary URLs in DOM Distiller Viewer.

chrome/browser/dom_distiller/dom_distiller_viewer_source_browsertest.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 <string.h>
 
 #include "base/command_line.h"
+#include "base/guid.h"
 #include "chrome/browser/dom_distiller/dom_distiller_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "components/dom_distiller/content/dom_distiller_viewer_source.h"
 #include "components/dom_distiller/core/distiller.h"
 #include "components/dom_distiller/core/dom_distiller_service.h"
 #include "components/dom_distiller/core/dom_distiller_store.h"
 #include "components/dom_distiller/core/dom_distiller_test_util.h"
 #include "components/dom_distiller/core/fake_db.h"
 #include "components/dom_distiller/core/fake_distiller.h"
 #include "components/dom_distiller/core/task_tracker.h"
+#include "components/dom_distiller/core/url_constants.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/url_data_source.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_observer.h"
+#include "net/base/escape.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace dom_distiller {
 
 using test::FakeDB;
 using test::FakeDistiller;
 using test::MockDistillerFactory;
 using test::util::CreateStoreWithFakeDB;
 
 namespace {
@@ skipping 93 matching lines @@
     if (expect_distillation_) {
       // There will only be destillation of an article if the database contains
       // the article.
       FakeDistiller* distiller = new FakeDistiller(true);
       EXPECT_CALL(*factory, CreateDistillerImpl())
           .WillOnce(testing::Return(distiller));
     }
     return service;
   }
 
-  void ViewSingleDistilledPage();
+  void ViewSingleDistilledPage(const GURL& url);
 
   // Database entries.
   static FakeDB::EntryMap* database_model_;
   static bool expect_distillation_;
 };
 
 FakeDB::EntryMap* DomDistillerViewerSourceBrowserTest::database_model_;
 bool DomDistillerViewerSourceBrowserTest::expect_distillation_ = false;
 
 // The DomDistillerViewerSource renders untrusted content, so ensure no bindings
 // are enabled when the article exists in the database.
 IN_PROC_BROWSER_TEST_F(DomDistillerViewerSourceBrowserTest,
                        NoWebUIBindingsArticleExists) {
   // Ensure there is one item in the database, which will trigger distillation.
-  ArticleEntry entry = CreateEntry("DISTILLED", "http://example.com/1");
+  const ArticleEntry entry = CreateEntry("DISTILLED", "http://example.com/1");
   AddEntry(entry, database_model_);
   expect_distillation_ = true;
-  ViewSingleDistilledPage();
+  const GURL url(std::string(chrome::kDomDistillerScheme) + "://" +

[shashi, 2014/02/05 22:28:08]

nit: can be refactored into a function, e.g. GetDistillerViewURLFromEntryId().

[nyquist, 2014/02/25 20:30:24]

Done.

+                 base::GenerateGUID() + "/?" + std::string(kEntryIdKey) + "=" +
+                 net::EscapeQueryParamValue(entry.entry_id(), true));
+  ViewSingleDistilledPage(url);
 }
 
 // The DomDistillerViewerSource renders untrusted content, so ensure no bindings
 // are enabled when the article is not found.
 IN_PROC_BROWSER_TEST_F(DomDistillerViewerSourceBrowserTest,
                        NoWebUIBindingsArticleNotFound) {
   // The article does not exist, so assume no distillation will happen.
   expect_distillation_ = false;
-  ViewSingleDistilledPage();
+  const GURL url(std::string(chrome::kDomDistillerScheme) + "://" +
+                 base::GenerateGUID() + "/");
+  ViewSingleDistilledPage(url);
 }
 
-void DomDistillerViewerSourceBrowserTest::ViewSingleDistilledPage() {
+// The DomDistillerViewerSource renders untrusted content, so ensure no bindings
+// are enabled when requesting to view an arbitrary URL.
+IN_PROC_BROWSER_TEST_F(DomDistillerViewerSourceBrowserTest,
+                       NoWebUIBindingsViewUrl) {
+  // We should expect distillation for any valid URL.
+  expect_distillation_ = true;
+  std::string view_url = "http://www.example.com/1";
+  const GURL url(std::string(chrome::kDomDistillerScheme) + "://" +
+                 base::GenerateGUID() + "/?" + std::string(kUrlKey) + "=" +
+                 net::EscapeQueryParamValue(view_url, true));

[shashi, 2014/02/05 22:28:08]

nit: can be refactored to a function GetDistillerViewUrlFromUrl()

[nyquist, 2014/02/25 20:30:24]

Done.

+  ViewSingleDistilledPage(url);
+}
+
+void DomDistillerViewerSourceBrowserTest::ViewSingleDistilledPage(
+    const GURL& url) {
   // Create the service.
   DomDistillerContextKeyedService* service =
       static_cast<DomDistillerContextKeyedService*>(
           dom_distiller::DomDistillerServiceFactory::GetInstance()
               ->SetTestingFactoryAndUse(browser()->profile(), &Build));
 
   // Ensure the source is registered.
   // TODO(nyquist): Remove when the source is always registered on startup.
   DomDistillerViewerSource* source =
       new DomDistillerViewerSource(service, chrome::kDomDistillerScheme);
   content::URLDataSource::Add(browser()->profile(), source);
 
   // Setup observer to inspect the RenderViewHost after committed navigation.
   content::WebContents* contents =
       browser()->tab_strip_model()->GetActiveWebContents();
   LoadSuccessObserver observer(contents);
 
   // Navigate to a URL which the source should respond to.
-  std::string url_without_scheme = "://distilled";
-  GURL url(chrome::kDomDistillerScheme + url_without_scheme);
   ui_test_utils::NavigateToURL(browser(), url);
 
   // A navigation should have succeeded to the correct URL.
   ASSERT_FALSE(observer.load_failed());
   ASSERT_TRUE(observer.finished_load());
   ASSERT_EQ(url, observer.validated_url());
   // Ensure no bindings.
   const content::RenderViewHost* render_view_host = observer.render_view_host();
   ASSERT_EQ(0, render_view_host->GetEnabledBindings());
   // The MIME-type should always be text/html for the distilled articles.
@@ skipping 26 matching lines @@
   ASSERT_TRUE(observer.finished_load());
   ASSERT_EQ(url, observer.validated_url());
   // Ensure no bindings.
   const content::RenderViewHost* render_view_host = observer.render_view_host();
   ASSERT_EQ(0, render_view_host->GetEnabledBindings());
   // The MIME-type should always be text/css for the CSS resources.
   EXPECT_EQ("text/css", observer.web_contents()->GetContentsMimeType());
 }
 
 }  // namespace dom_distiller