| Index: components/dom_distiller/content/browser/distillable_page_utils_browsertest.cc
|
| diff --git a/components/dom_distiller/content/browser/distillable_page_utils_browsertest.cc b/components/dom_distiller/content/browser/distillable_page_utils_browsertest.cc
|
| deleted file mode 100644
|
| index 7723e67be4ba7562186e4a9ee7b123dc39a25629..0000000000000000000000000000000000000000
|
| --- a/components/dom_distiller/content/browser/distillable_page_utils_browsertest.cc
|
| +++ /dev/null
|
| @@ -1,179 +0,0 @@
|
| -// 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 "base/bind.h"
|
| -#include "base/path_service.h"
|
| -#include "base/run_loop.h"
|
| -#include "components/dom_distiller/content/browser/distillable_page_utils.h"
|
| -#include "components/dom_distiller/content/browser/distiller_javascript_utils.h"
|
| -#include "components/dom_distiller/core/distillable_page_detector.h"
|
| -#include "components/dom_distiller/core/page_features.h"
|
| -#include "content/public/browser/browser_context.h"
|
| -#include "content/public/browser/render_frame_host.h"
|
| -#include "content/public/browser/web_contents_observer.h"
|
| -#include "content/public/common/isolated_world_ids.h"
|
| -#include "content/public/test/content_browser_test.h"
|
| -#include "content/shell/browser/shell.h"
|
| -#include "net/test/embedded_test_server/embedded_test_server.h"
|
| -#include "ui/base/resource/resource_bundle.h"
|
| -
|
| -namespace dom_distiller {
|
| -namespace {
|
| -
|
| -const char* kArticlePath = "/og_article.html";
|
| -const char* kNonArticlePath = "/non_og_article.html";
|
| -
|
| -class DomDistillerDistillablePageUtilsTest : public content::ContentBrowserTest,
|
| - content::WebContentsObserver {
|
| - public:
|
| - void SetUpOnMainThread() override {
|
| - if (!DistillerJavaScriptWorldIdIsSet()) {
|
| - SetDistillerJavaScriptWorldId(content::ISOLATED_WORLD_ID_CONTENT_END);
|
| - }
|
| - AddComponentsResources();
|
| - SetUpTestServer();
|
| - ContentBrowserTest::SetUpOnMainThread();
|
| - }
|
| -
|
| - void LoadURL(const std::string& url) {
|
| - content::WebContents* current_web_contents = shell()->web_contents();
|
| - Observe(current_web_contents);
|
| - base::RunLoop url_loaded_runner;
|
| - main_frame_loaded_callback_ = url_loaded_runner.QuitClosure();
|
| - current_web_contents->GetController().LoadURL(
|
| - embedded_test_server()->GetURL(url),
|
| - content::Referrer(),
|
| - ui::PAGE_TRANSITION_TYPED,
|
| - std::string());
|
| - url_loaded_runner.Run();
|
| - main_frame_loaded_callback_ = base::Closure();
|
| - Observe(nullptr);
|
| - }
|
| -
|
| - private:
|
| - void AddComponentsResources() {
|
| - base::FilePath pak_file;
|
| - base::FilePath pak_dir;
|
| -#if defined(OS_ANDROID)
|
| - CHECK(PathService::Get(base::DIR_ANDROID_APP_DATA, &pak_dir));
|
| - pak_dir = pak_dir.Append(FILE_PATH_LITERAL("paks"));
|
| -#else
|
| - PathService::Get(base::DIR_MODULE, &pak_dir);
|
| -#endif // OS_ANDROID
|
| - pak_file =
|
| - pak_dir.Append(FILE_PATH_LITERAL("components_tests_resources.pak"));
|
| - ui::ResourceBundle::GetSharedInstance().AddDataPackFromPath(
|
| - pak_file, ui::SCALE_FACTOR_NONE);
|
| - }
|
| -
|
| - void SetUpTestServer() {
|
| - base::FilePath path;
|
| - PathService::Get(base::DIR_SOURCE_ROOT, &path);
|
| - path = path.AppendASCII("components/test/data/dom_distiller");
|
| - embedded_test_server()->ServeFilesFromDirectory(path);
|
| - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
|
| - }
|
| -
|
| - void DocumentLoadedInFrame(
|
| - content::RenderFrameHost* render_frame_host) override {
|
| - if (!render_frame_host->GetParent())
|
| - main_frame_loaded_callback_.Run();
|
| - }
|
| -
|
| - base::Closure main_frame_loaded_callback_;
|
| -};
|
| -
|
| -class ResultHolder {
|
| - public:
|
| - ResultHolder(base::Closure callback) : callback_(callback) {}
|
| -
|
| - void OnResult(bool result) {
|
| - result_ = result;
|
| - callback_.Run();
|
| - }
|
| -
|
| - bool GetResult() {
|
| - return result_;
|
| - }
|
| -
|
| - base::Callback<void(bool)> GetCallback() {
|
| - return base::Bind(&ResultHolder::OnResult, base::Unretained(this));
|
| - }
|
| -
|
| - private:
|
| - base::Closure callback_;
|
| - bool result_;
|
| -};
|
| -
|
| -} // namespace
|
| -
|
| -IN_PROC_BROWSER_TEST_F(DomDistillerDistillablePageUtilsTest, TestIsOGArticle) {
|
| - LoadURL(kArticlePath);
|
| - base::RunLoop run_loop_;
|
| - ResultHolder holder(run_loop_.QuitClosure());
|
| - IsOpenGraphArticle(shell()->web_contents(), holder.GetCallback());
|
| - run_loop_.Run();
|
| - ASSERT_TRUE(holder.GetResult());
|
| -}
|
| -
|
| -IN_PROC_BROWSER_TEST_F(DomDistillerDistillablePageUtilsTest,
|
| - TestIsNotOGArticle) {
|
| - LoadURL(kNonArticlePath);
|
| - base::RunLoop run_loop_;
|
| - ResultHolder holder(run_loop_.QuitClosure());
|
| - IsOpenGraphArticle(shell()->web_contents(), holder.GetCallback());
|
| - run_loop_.Run();
|
| - ASSERT_FALSE(holder.GetResult());
|
| -}
|
| -
|
| -IN_PROC_BROWSER_TEST_F(DomDistillerDistillablePageUtilsTest,
|
| - TestIsDistillablePage) {
|
| - scoped_ptr<AdaBoostProto> proto(new AdaBoostProto);
|
| - proto->set_num_features(kDerivedFeaturesCount);
|
| - proto->set_num_stumps(1);
|
| -
|
| - StumpProto* stump = proto->add_stump();
|
| - stump->set_feature_number(0);
|
| - stump->set_weight(1);
|
| - stump->set_split(-1);
|
| - scoped_ptr<DistillablePageDetector> detector(
|
| - new DistillablePageDetector(proto.Pass()));
|
| - EXPECT_DOUBLE_EQ(0.5, detector->GetThreshold());
|
| - // The first value of the first feature is either 0 or 1. Since the stump's
|
| - // split is -1, the stump weight will be applied to any set of derived
|
| - // features.
|
| - LoadURL(kArticlePath);
|
| - base::RunLoop run_loop_;
|
| - ResultHolder holder(run_loop_.QuitClosure());
|
| - IsDistillablePageForDetector(shell()->web_contents(), detector.get(),
|
| - holder.GetCallback());
|
| - run_loop_.Run();
|
| - ASSERT_TRUE(holder.GetResult());
|
| -}
|
| -
|
| -IN_PROC_BROWSER_TEST_F(DomDistillerDistillablePageUtilsTest,
|
| - TestIsNotDistillablePage) {
|
| - scoped_ptr<AdaBoostProto> proto(new AdaBoostProto);
|
| - proto->set_num_features(kDerivedFeaturesCount);
|
| - proto->set_num_stumps(1);
|
| - StumpProto* stump = proto->add_stump();
|
| - stump->set_feature_number(0);
|
| - stump->set_weight(-1);
|
| - stump->set_split(-1);
|
| - scoped_ptr<DistillablePageDetector> detector(
|
| - new DistillablePageDetector(proto.Pass()));
|
| - EXPECT_DOUBLE_EQ(-0.5, detector->GetThreshold());
|
| - // The first value of the first feature is either 0 or 1. Since the stump's
|
| - // split is -1, the stump weight will be applied to any set of derived
|
| - // features.
|
| - LoadURL(kArticlePath);
|
| - base::RunLoop run_loop_;
|
| - ResultHolder holder(run_loop_.QuitClosure());
|
| - IsDistillablePageForDetector(shell()->web_contents(), detector.get(),
|
| - holder.GetCallback());
|
| - run_loop_.Run();
|
| - ASSERT_FALSE(holder.GetResult());
|
| -}
|
| -
|
| -} // namespace dom_distiller
|
|
|