Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(318)

Unified Diff: chrome/browser/dom_distiller/dom_distiller_viewer_source_browsertest.cc

Issue 134873008: Add support for displaying distilled articles. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Reverting change to scoped_ptr Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/dom_distiller/dom_distiller_service_factory.cc ('k') | components/dom_distiller.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/dom_distiller/dom_distiller_viewer_source_browsertest.cc
diff --git a/chrome/browser/dom_distiller/dom_distiller_viewer_source_browsertest.cc b/chrome/browser/dom_distiller/dom_distiller_viewer_source_browsertest.cc
index 3748d2407b9a7d5d337456ede489327b12b90361..e132ecbb35fec6987d5cfbba9566353e9ebb1516 100644
--- a/chrome/browser/dom_distiller/dom_distiller_viewer_source_browsertest.cc
+++ b/chrome/browser/dom_distiller/dom_distiller_viewer_source_browsertest.cc
@@ -5,6 +5,7 @@
#include <string.h>
#include "base/command_line.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"
@@ -13,6 +14,13 @@
#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 "content/public/browser/render_view_host.h"
#include "content/public/browser/url_data_source.h"
#include "content/public/browser/web_contents.h"
@@ -21,6 +29,29 @@
namespace dom_distiller {
+using test::FakeDB;
+using test::FakeDistiller;
+using test::MockDistillerFactory;
+using test::util::CreateStoreWithFakeDB;
+
+namespace {
+
+void AddEntry(const ArticleEntry& e, FakeDB::EntryMap* map) {
+ (*map)[e.entry_id()] = e;
+}
+
+ArticleEntry CreateEntry(std::string entry_id, std::string page_url) {
+ ArticleEntry entry;
+ entry.set_entry_id(entry_id);
+ if (!page_url.empty()) {
+ ArticleEntryPage* page = entry.add_pages();
+ page->set_url(page_url);
+ }
+ return entry;
+}
+
+} // namespace
+
// WebContents observer that stores reference to the current |RenderViewHost|.
class LoadSuccessObserver : public content::WebContentsObserver {
public:
@@ -29,6 +60,7 @@ class LoadSuccessObserver : public content::WebContentsObserver {
validated_url_(GURL()),
finished_load_(false),
load_failed_(false),
+ web_contents_(contents),
render_view_host_(NULL) {}
virtual void DidFinishLoad(int64 frame_id,
@@ -55,6 +87,7 @@ class LoadSuccessObserver : public content::WebContentsObserver {
const GURL& validated_url() const { return validated_url_; }
bool finished_load() const { return finished_load_; }
bool load_failed() const { return load_failed_; }
+ content::WebContents* web_contents() const { return web_contents_; }
const content::RenderViewHost* render_view_host() const {
return render_view_host_;
@@ -64,6 +97,7 @@ class LoadSuccessObserver : public content::WebContentsObserver {
GURL validated_url_;
bool finished_load_;
bool load_failed_;
+ content::WebContents* web_contents_;
content::RenderViewHost* render_view_host_;
DISALLOW_COPY_AND_ASSIGN(LoadSuccessObserver);
@@ -74,19 +108,78 @@ class DomDistillerViewerSourceBrowserTest : public InProcessBrowserTest {
DomDistillerViewerSourceBrowserTest() {}
virtual ~DomDistillerViewerSourceBrowserTest() {}
+ virtual void SetUpOnMainThread() OVERRIDE {
+ database_model_ = new FakeDB::EntryMap;
+ }
+
+ virtual void CleanUpOnMainThread() OVERRIDE { delete database_model_; }
+
virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
command_line->AppendSwitch(switches::kEnableDomDistiller);
}
+
+ static BrowserContextKeyedService* Build(content::BrowserContext* context) {
+ FakeDB* fake_db = new FakeDB(database_model_);
+ MockDistillerFactory* factory = new MockDistillerFactory();
+ DomDistillerContextKeyedService* service =
+ new DomDistillerContextKeyedService(
+ scoped_ptr<DomDistillerStoreInterface>(
+ CreateStoreWithFakeDB(fake_db, FakeDB::EntryMap())),
+ scoped_ptr<DistillerFactory>(factory));
+ fake_db->InitCallback(true);
+ fake_db->LoadCallback(true);
+ 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();
+
+ // 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.
-IN_PROC_BROWSER_TEST_F(DomDistillerViewerSourceBrowserTest, NoWebUIBindings) {
+// 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");
+ AddEntry(entry, database_model_);
+ expect_distillation_ = true;
+ ViewSingleDistilledPage();
+}
+
+// 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();
+}
+
+void DomDistillerViewerSourceBrowserTest::ViewSingleDistilledPage() {
+ // 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.
- content::URLDataSource::Add(
- browser()->profile(),
- new DomDistillerViewerSource(chrome::kDomDistillerScheme));
+ 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 =
@@ -105,6 +198,8 @@ IN_PROC_BROWSER_TEST_F(DomDistillerViewerSourceBrowserTest, NoWebUIBindings) {
// 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.
+ EXPECT_EQ("text/html", observer.web_contents()->GetContentsMimeType());
}
} // namespace dom_distiller
« no previous file with comments | « chrome/browser/dom_distiller/dom_distiller_service_factory.cc ('k') | components/dom_distiller.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698