OLD | NEW |
---|---|
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/android/offline_pages/evaluation/offline_page_evaluatio n_bridge.h" | 5 #include "chrome/browser/android/offline_pages/evaluation/offline_page_evaluatio n_bridge.h" |
6 | 6 |
7 #include "base/android/callback_android.h" | 7 #include "base/android/callback_android.h" |
8 #include "base/android/jni_android.h" | 8 #include "base/android/jni_android.h" |
9 #include "base/android/jni_array.h" | 9 #include "base/android/jni_array.h" |
10 #include "base/android/jni_string.h" | 10 #include "base/android/jni_string.h" |
11 #include "base/bind.h" | 11 #include "base/bind.h" |
12 #include "base/memory/ptr_util.h" | 12 #include "base/memory/ptr_util.h" |
13 #include "base/sequenced_task_runner.h" | 13 #include "base/sequenced_task_runner.h" |
14 #include "base/threading/sequenced_worker_pool.h" | 14 #include "base/task_scheduler/post_task.h" |
15 #include "chrome/browser/android/offline_pages/background_loader_offliner.h" | 15 #include "chrome/browser/android/offline_pages/background_loader_offliner.h" |
16 #include "chrome/browser/android/offline_pages/background_scheduler_bridge.h" | 16 #include "chrome/browser/android/offline_pages/background_scheduler_bridge.h" |
17 #include "chrome/browser/android/offline_pages/downloads/offline_page_notificati on_bridge.h" | 17 #include "chrome/browser/android/offline_pages/downloads/offline_page_notificati on_bridge.h" |
18 #include "chrome/browser/android/offline_pages/evaluation/evaluation_test_schedu ler.h" | 18 #include "chrome/browser/android/offline_pages/evaluation/evaluation_test_schedu ler.h" |
19 #include "chrome/browser/android/offline_pages/offline_page_model_factory.h" | 19 #include "chrome/browser/android/offline_pages/offline_page_model_factory.h" |
20 #include "chrome/browser/android/offline_pages/prerendering_offliner.h" | 20 #include "chrome/browser/android/offline_pages/prerendering_offliner.h" |
21 #include "chrome/browser/android/offline_pages/request_coordinator_factory.h" | 21 #include "chrome/browser/android/offline_pages/request_coordinator_factory.h" |
22 #include "chrome/browser/net/nqe/ui_network_quality_estimator_service.h" | 22 #include "chrome/browser/net/nqe/ui_network_quality_estimator_service.h" |
23 #include "chrome/browser/net/nqe/ui_network_quality_estimator_service_factory.h" | 23 #include "chrome/browser/net/nqe/ui_network_quality_estimator_service_factory.h" |
24 #include "chrome/browser/profiles/profile.h" | 24 #include "chrome/browser/profiles/profile.h" |
25 #include "chrome/browser/profiles/profile_android.h" | 25 #include "chrome/browser/profiles/profile_android.h" |
26 #include "chrome/common/chrome_constants.h" | 26 #include "chrome/common/chrome_constants.h" |
27 #include "components/offline_pages/core/background/offliner.h" | 27 #include "components/offline_pages/core/background/offliner.h" |
28 #include "components/offline_pages/core/background/offliner_policy.h" | 28 #include "components/offline_pages/core/background/offliner_policy.h" |
29 #include "components/offline_pages/core/background/request_coordinator.h" | 29 #include "components/offline_pages/core/background/request_coordinator.h" |
30 #include "components/offline_pages/core/background/request_notifier.h" | 30 #include "components/offline_pages/core/background/request_notifier.h" |
31 #include "components/offline_pages/core/background/request_queue.h" | 31 #include "components/offline_pages/core/background/request_queue.h" |
32 #include "components/offline_pages/core/background/request_queue_store.h" | 32 #include "components/offline_pages/core/background/request_queue_store.h" |
33 #include "components/offline_pages/core/background/request_queue_store_sql.h" | 33 #include "components/offline_pages/core/background/request_queue_store_sql.h" |
34 #include "components/offline_pages/core/background/save_page_request.h" | 34 #include "components/offline_pages/core/background/save_page_request.h" |
35 #include "components/offline_pages/core/downloads/download_notifying_observer.h" | 35 #include "components/offline_pages/core/downloads/download_notifying_observer.h" |
36 #include "components/offline_pages/core/offline_page_item.h" | 36 #include "components/offline_pages/core/offline_page_item.h" |
37 #include "components/offline_pages/core/offline_page_model.h" | 37 #include "components/offline_pages/core/offline_page_model.h" |
38 #include "content/public/browser/browser_context.h" | 38 #include "content/public/browser/browser_context.h" |
39 #include "content/public/browser/browser_thread.h" | |
40 #include "jni/OfflinePageEvaluationBridge_jni.h" | 39 #include "jni/OfflinePageEvaluationBridge_jni.h" |
41 #include "jni/SavePageRequest_jni.h" | 40 #include "jni/SavePageRequest_jni.h" |
42 | 41 |
43 using base::android::ConvertJavaStringToUTF8; | 42 using base::android::ConvertJavaStringToUTF8; |
44 using base::android::ConvertUTF8ToJavaString; | 43 using base::android::ConvertUTF8ToJavaString; |
45 using base::android::JavaParamRef; | 44 using base::android::JavaParamRef; |
46 using base::android::ScopedJavaGlobalRef; | 45 using base::android::ScopedJavaGlobalRef; |
47 using base::android::ScopedJavaLocalRef; | 46 using base::android::ScopedJavaLocalRef; |
48 | 47 |
49 namespace offline_pages { | 48 namespace offline_pages { |
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
125 const MultipleItemStatuses& removed_request_results) { | 124 const MultipleItemStatuses& removed_request_results) { |
126 base::android::RunCallbackAndroid(j_callback_obj, | 125 base::android::RunCallbackAndroid(j_callback_obj, |
127 int(removed_request_results.size())); | 126 int(removed_request_results.size())); |
128 } | 127 } |
129 | 128 |
130 std::unique_ptr<KeyedService> GetTestingRequestCoordinator( | 129 std::unique_ptr<KeyedService> GetTestingRequestCoordinator( |
131 content::BrowserContext* context, | 130 content::BrowserContext* context, |
132 std::unique_ptr<OfflinerPolicy> policy, | 131 std::unique_ptr<OfflinerPolicy> policy, |
133 std::unique_ptr<Offliner> offliner) { | 132 std::unique_ptr<Offliner> offliner) { |
134 scoped_refptr<base::SequencedTaskRunner> background_task_runner = | 133 scoped_refptr<base::SequencedTaskRunner> background_task_runner = |
135 content::BrowserThread::GetBlockingPool()->GetSequencedTaskRunner( | 134 base::CreateSequencedTaskRunnerWithTraits( |
136 content::BrowserThread::GetBlockingPool()->GetSequenceToken()); | 135 base::TaskTraits().MayBlock().WithPriority( |
136 base::TaskPriority::BACKGROUND)); | |
romax
2017/04/24 20:00:30
I think the same comment by dewittj@ at https://co
fdoray
2017/04/26 19:29:37
Switched to no explicit priority. Priority will be
| |
137 Profile* profile = Profile::FromBrowserContext(context); | 137 Profile* profile = Profile::FromBrowserContext(context); |
138 base::FilePath queue_store_path = | 138 base::FilePath queue_store_path = |
139 profile->GetPath().Append(chrome::kOfflinePageRequestQueueDirname); | 139 profile->GetPath().Append(chrome::kOfflinePageRequestQueueDirname); |
140 | 140 |
141 std::unique_ptr<RequestQueueStoreSQL> queue_store( | 141 std::unique_ptr<RequestQueueStoreSQL> queue_store( |
142 new RequestQueueStoreSQL(background_task_runner, queue_store_path)); | 142 new RequestQueueStoreSQL(background_task_runner, queue_store_path)); |
143 std::unique_ptr<RequestQueue> queue(new RequestQueue(std::move(queue_store))); | 143 std::unique_ptr<RequestQueue> queue(new RequestQueue(std::move(queue_store))); |
144 std::unique_ptr<android::EvaluationTestScheduler> scheduler( | 144 std::unique_ptr<android::EvaluationTestScheduler> scheduler( |
145 new android::EvaluationTestScheduler()); | 145 new android::EvaluationTestScheduler()); |
146 net::NetworkQualityEstimator::NetworkQualityProvider* | 146 net::NetworkQualityEstimator::NetworkQualityProvider* |
(...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
384 return; | 384 return; |
385 JNIEnv* env = base::android::AttachCurrentThread(); | 385 JNIEnv* env = base::android::AttachCurrentThread(); |
386 ScopedJavaLocalRef<jobject> obj = weak_java_ref_.get(env); | 386 ScopedJavaLocalRef<jobject> obj = weak_java_ref_.get(env); |
387 if (obj.is_null()) | 387 if (obj.is_null()) |
388 return; | 388 return; |
389 Java_OfflinePageEvaluationBridge_offlinePageModelLoaded(env, obj); | 389 Java_OfflinePageEvaluationBridge_offlinePageModelLoaded(env, obj); |
390 } | 390 } |
391 | 391 |
392 } // namespace android | 392 } // namespace android |
393 } // namespace offline_pages | 393 } // namespace offline_pages |
OLD | NEW |