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

Unified Diff: chrome/browser/android/offline_pages/evaluation/offline_page_evaluation_bridge.cc

Issue 2432593002: [Offline Pages] Add basic evaluation tests and related changes. (Closed)
Patch Set: Fix build failure. Created 4 years, 2 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
Index: chrome/browser/android/offline_pages/evaluation/offline_page_evaluation_bridge.cc
diff --git a/chrome/browser/android/offline_pages/evaluation/offline_page_evaluation_bridge.cc b/chrome/browser/android/offline_pages/evaluation/offline_page_evaluation_bridge.cc
index 7427d14f09c0bca4fb33bc50bcd4f38157147f4f..7022f4ec02d647907f9e19b28cef393d69578e00 100644
--- a/chrome/browser/android/offline_pages/evaluation/offline_page_evaluation_bridge.cc
+++ b/chrome/browser/android/offline_pages/evaluation/offline_page_evaluation_bridge.cc
@@ -76,14 +76,23 @@ void OnPushRequestsDone(const ScopedJavaGlobalRef<jobject>& j_callback_obj,
static ScopedJavaLocalRef<jobject> GetBridgeForProfile(
JNIEnv* env,
const JavaParamRef<jclass>& jcaller,
- const JavaParamRef<jobject>& j_profile) {
+ const JavaParamRef<jobject>& j_profile,
+ const jboolean j_use_evaluation_scheduler) {
Profile* profile = ProfileAndroid::FromProfileAndroid(j_profile);
OfflinePageModel* offline_page_model =
OfflinePageModelFactory::GetForBrowserContext(profile);
- RequestCoordinator* request_coordinator =
- RequestCoordinatorFactory::GetForBrowserContext(profile);
+ RequestCoordinator* request_coordinator = nullptr;
+
+ if (j_use_evaluation_scheduler) {
+ request_coordinator = static_cast<RequestCoordinator*>(
+ RequestCoordinatorFactory::GetInstance()->SetTestingFactoryAndUse(
+ profile, &RequestCoordinatorFactory::GetTestingFactory));
+ } else {
+ request_coordinator =
+ RequestCoordinatorFactory::GetForBrowserContext(profile);
+ }
if (offline_page_model == nullptr || request_coordinator == nullptr)
return ScopedJavaLocalRef<jobject>();
@@ -172,7 +181,7 @@ void OfflinePageEvaluationBridge::GetAllPages(
base::Bind(&GetAllPagesCallback, j_result_ref, j_callback_ref));
}
-void OfflinePageEvaluationBridge::PushRequestProcessing(
+bool OfflinePageEvaluationBridge::PushRequestProcessing(
JNIEnv* env,
const JavaParamRef<jobject>& obj,
const JavaParamRef<jobject>& j_callback_obj) {
@@ -183,7 +192,7 @@ void OfflinePageEvaluationBridge::PushRequestProcessing(
net::NetworkChangeNotifier::ConnectionType connection =
net::NetworkChangeNotifier::GetConnectionType();
DeviceConditions device_conditions(false, 0, connection);
- request_coordinator_->StartProcessing(
+ return request_coordinator_->StartProcessing(
device_conditions, base::Bind(&OnPushRequestsDone, j_callback_ref));
}

Powered by Google App Engine
This is Rietveld 408576698