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

Unified Diff: chrome/browser/android/offline_pages/prerendering_offliner_unittest.cc

Issue 2015603002: PrerenderingLoader initial integration with PrerenderManager/PrerenderHandle and make it unit-testa… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Adds mock adapter member initialization in constructor Created 4 years, 7 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/android/offline_pages/prerendering_offliner.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/android/offline_pages/prerendering_offliner_unittest.cc
diff --git a/chrome/browser/android/offline_pages/prerendering_offliner_unittest.cc b/chrome/browser/android/offline_pages/prerendering_offliner_unittest.cc
index f13a1237266ac01a1399b895ed6bc257ea128399..71f66b6c277ebd73af90c9c51f9ba2d4057a7671 100644
--- a/chrome/browser/android/offline_pages/prerendering_offliner_unittest.cc
+++ b/chrome/browser/android/offline_pages/prerendering_offliner_unittest.cc
@@ -10,6 +10,7 @@
#include "chrome/browser/android/offline_pages/prerendering_loader.h"
#include "components/offline_pages/background/offliner.h"
#include "components/offline_pages/background/save_page_request.h"
+#include "content/public/test/test_browser_thread_bundle.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace offline_pages {
@@ -24,7 +25,9 @@ const ClientId kClientId("AsyncLoading", "88");
class MockPrerenderingLoader : public PrerenderingLoader {
public:
explicit MockPrerenderingLoader(content::BrowserContext* browser_context)
- : PrerenderingLoader(browser_context), mock_loading_(false) {}
+ : PrerenderingLoader(browser_context),
+ mock_loading_(false),
+ mock_loaded_(false) {}
~MockPrerenderingLoader() override {}
bool LoadPage(const GURL& url, const LoadPageCallback& callback) override {
@@ -32,12 +35,18 @@ class MockPrerenderingLoader : public PrerenderingLoader {
return mock_loading_;
}
- void StopLoading() override { mock_loading_ = false; }
+ void StopLoading() override {
+ mock_loading_ = false;
+ mock_loaded_ = false;
+ }
+ bool IsIdle() override { return !mock_loading_ && !mock_loaded_; }
+ bool IsLoaded() override { return mock_loaded_; }
bool mock_loading() const { return mock_loading_; }
private:
bool mock_loading_;
+ bool mock_loaded_;
DISALLOW_COPY_AND_ASSIGN(MockPrerenderingLoader);
};
@@ -58,23 +67,23 @@ class PrerenderingOfflinerTest : public testing::Test {
}
bool loading() const { return loader_->mock_loading(); }
- Offliner::CompletionStatus completion_status() {
- return completion_status_;
- }
+ Offliner::RequestStatus completion_status() { return completion_status_; }
private:
void OnCompletion(const SavePageRequest& request,
- Offliner::CompletionStatus status);
+ Offliner::RequestStatus status);
+ content::TestBrowserThreadBundle thread_bundle_;
std::unique_ptr<PrerenderingOffliner> offliner_;
// Not owned.
MockPrerenderingLoader* loader_;
- Offliner::CompletionStatus completion_status_;
+ Offliner::RequestStatus completion_status_;
DISALLOW_COPY_AND_ASSIGN(PrerenderingOfflinerTest);
};
-PrerenderingOfflinerTest::PrerenderingOfflinerTest() {}
+PrerenderingOfflinerTest::PrerenderingOfflinerTest()
+ : thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP) {}
PrerenderingOfflinerTest::~PrerenderingOfflinerTest() {}
@@ -87,7 +96,7 @@ void PrerenderingOfflinerTest::SetUp() {
}
void PrerenderingOfflinerTest::OnCompletion(const SavePageRequest& request,
- Offliner::CompletionStatus status) {
+ Offliner::RequestStatus status) {
completion_status_ = status;
}
« no previous file with comments | « chrome/browser/android/offline_pages/prerendering_offliner.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698