| Index: chrome/browser/android/offline_pages/prerendering_loader_unittest.cc
|
| diff --git a/chrome/browser/android/offline_pages/prerendering_loader_unittest.cc b/chrome/browser/android/offline_pages/prerendering_loader_unittest.cc
|
| index d7ce9f82633c6bb7d37409d1ce1b14222545dcc4..929d78b1a91068000fc62a22fead9fa1050cd0f5 100644
|
| --- a/chrome/browser/android/offline_pages/prerendering_loader_unittest.cc
|
| +++ b/chrome/browser/android/offline_pages/prerendering_loader_unittest.cc
|
| @@ -25,14 +25,12 @@ class TestAdapter : public PrerenderAdapter {
|
| explicit TestAdapter(PrerenderAdapter::Observer* observer)
|
| : PrerenderAdapter(observer),
|
| active_(false),
|
| - disabled_(false),
|
| fail_start_(false),
|
| observer_(observer),
|
| final_status_(prerender::FINAL_STATUS_MAX) {}
|
| ~TestAdapter() override {}
|
|
|
| // PrerenderAdapter implementation.
|
| - bool CanPrerender() const override;
|
| bool StartPrerender(
|
| content::BrowserContext* browser_context,
|
| const GURL& url,
|
| @@ -43,10 +41,6 @@ class TestAdapter : public PrerenderAdapter {
|
| bool IsActive() const override;
|
| void DestroyActive() override;
|
|
|
| - // Sets prerendering to be disabled. This will cause the CanPrerender()
|
| - // to return false.
|
| - void Disable();
|
| -
|
| // Sets prerendering to fail start prerender requests.
|
| void FailStart();
|
|
|
| @@ -59,7 +53,6 @@ class TestAdapter : public PrerenderAdapter {
|
|
|
| private:
|
| bool active_;
|
| - bool disabled_;
|
| bool fail_start_;
|
| PrerenderAdapter::Observer* observer_;
|
| std::unique_ptr<content::WebContents> web_contents_;
|
| @@ -68,10 +61,6 @@ class TestAdapter : public PrerenderAdapter {
|
| DISALLOW_COPY_AND_ASSIGN(TestAdapter);
|
| };
|
|
|
| -void TestAdapter::Disable() {
|
| - disabled_ = true;
|
| -}
|
| -
|
| void TestAdapter::FailStart() {
|
| fail_start_ = true;
|
| }
|
| @@ -82,10 +71,6 @@ void TestAdapter::Configure(content::WebContents* web_contents,
|
| final_status_ = final_status;
|
| }
|
|
|
| -bool TestAdapter::CanPrerender() const {
|
| - return !disabled_;
|
| -}
|
| -
|
| bool TestAdapter::StartPrerender(
|
| content::BrowserContext* browser_context,
|
| const GURL& url,
|
| @@ -168,14 +153,6 @@ void PrerenderingLoaderTest::OnLoadDone(Offliner::RequestStatus load_status,
|
| callback_load_status_ = load_status;
|
| }
|
|
|
| -TEST_F(PrerenderingLoaderTest, CanPrerender) {
|
| - DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
|
| - EXPECT_TRUE(loader()->CanPrerender());
|
| -
|
| - test_adapter()->Disable();
|
| - EXPECT_FALSE(loader()->CanPrerender());
|
| -}
|
| -
|
| TEST_F(PrerenderingLoaderTest, StopLoadingWhenIdle) {
|
| EXPECT_TRUE(loader()->IsIdle());
|
| loader()->StopLoading();
|
| @@ -390,16 +367,6 @@ TEST_F(PrerenderingLoaderTest, LoadPageNotAcceptedWhenNotIdle) {
|
| EXPECT_FALSE(loader()->IsIdle());
|
| }
|
|
|
| -TEST_F(PrerenderingLoaderTest, LoadPageNotAcceptedWhenPrerenderingDisabled) {
|
| - test_adapter()->Disable();
|
| - GURL gurl("http://testit.sea");
|
| - EXPECT_TRUE(loader()->IsIdle());
|
| - EXPECT_FALSE(loader()->LoadPage(
|
| - gurl,
|
| - base::Bind(&PrerenderingLoaderTest::OnLoadDone, base::Unretained(this))));
|
| - EXPECT_TRUE(loader()->IsIdle());
|
| -}
|
| -
|
| TEST_F(PrerenderingLoaderTest, LoadPageNotAcceptedWhenStartPrerenderFalse) {
|
| test_adapter()->FailStart();
|
| GURL gurl("http://testit.sea");
|
|
|