OLD | NEW |
1 // Copyright 2017 The Chromium Authors. All rights reserved. | 1 // Copyright 2017 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/browsing_data/browsing_data_bridge.h" | 5 #include "chrome/browser/android/browsing_data/browsing_data_bridge.h" |
6 | 6 |
7 #include <jni.h> | 7 #include <jni.h> |
8 #include <stddef.h> | 8 #include <stddef.h> |
9 | 9 |
10 #include <memory> | 10 #include <memory> |
11 #include <set> | 11 #include <set> |
12 #include <string> | 12 #include <string> |
13 #include <vector> | 13 #include <vector> |
14 | 14 |
15 #include "base/android/jni_android.h" | 15 #include "base/android/jni_android.h" |
16 #include "base/android/jni_array.h" | 16 #include "base/android/jni_array.h" |
17 #include "base/android/jni_string.h" | 17 #include "base/android/jni_string.h" |
18 #include "base/android/jni_weak_ref.h" | 18 #include "base/android/jni_weak_ref.h" |
19 #include "base/metrics/histogram_macros.h" | 19 #include "base/metrics/histogram_macros.h" |
20 #include "base/scoped_observer.h" | 20 #include "base/scoped_observer.h" |
21 #include "base/values.h" | 21 #include "base/values.h" |
22 #include "chrome/browser/browsing_data/browsing_data_remover_factory.h" | |
23 #include "chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h" | 22 #include "chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h" |
24 #include "chrome/browser/engagement/important_sites_util.h" | 23 #include "chrome/browser/engagement/important_sites_util.h" |
25 #include "chrome/browser/history/web_history_service_factory.h" | 24 #include "chrome/browser/history/web_history_service_factory.h" |
26 #include "chrome/browser/profiles/profile_manager.h" | 25 #include "chrome/browser/profiles/profile_manager.h" |
27 #include "chrome/browser/sync/profile_sync_service_factory.h" | 26 #include "chrome/browser/sync/profile_sync_service_factory.h" |
28 #include "chrome/common/channel_info.h" | 27 #include "chrome/common/channel_info.h" |
29 #include "components/browser_sync/profile_sync_service.h" | 28 #include "components/browser_sync/profile_sync_service.h" |
30 #include "components/browsing_data/core/history_notice_utils.h" | 29 #include "components/browsing_data/core/history_notice_utils.h" |
31 #include "components/prefs/pref_service.h" | 30 #include "components/prefs/pref_service.h" |
| 31 #include "content/public/browser/browser_context.h" |
32 #include "content/public/browser/browsing_data_filter_builder.h" | 32 #include "content/public/browser/browsing_data_filter_builder.h" |
| 33 #include "content/public/browser/browsing_data_remover.h" |
33 #include "jni/BrowsingDataBridge_jni.h" | 34 #include "jni/BrowsingDataBridge_jni.h" |
34 | 35 |
35 using base::android::AttachCurrentThread; | 36 using base::android::AttachCurrentThread; |
36 using base::android::JavaParamRef; | 37 using base::android::JavaParamRef; |
37 using base::android::JavaRef; | 38 using base::android::JavaRef; |
38 using base::android::ScopedJavaLocalRef; | 39 using base::android::ScopedJavaLocalRef; |
39 using base::android::ScopedJavaGlobalRef; | 40 using base::android::ScopedJavaGlobalRef; |
| 41 using content::BrowsingDataRemover; |
40 | 42 |
41 namespace { | 43 namespace { |
42 | 44 |
43 const size_t kMaxImportantSites = 5; | 45 const size_t kMaxImportantSites = 5; |
44 | 46 |
45 Profile* GetOriginalProfile() { | 47 Profile* GetOriginalProfile() { |
46 return ProfileManager::GetActiveUserProfile()->GetOriginalProfile(); | 48 return ProfileManager::GetActiveUserProfile()->GetOriginalProfile(); |
47 } | 49 } |
48 | 50 |
49 // Merges |task_count| BrowsingDataRemover completion callbacks and redirects | 51 // Merges |task_count| BrowsingDataRemover completion callbacks and redirects |
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
94 static void ClearBrowsingData( | 96 static void ClearBrowsingData( |
95 JNIEnv* env, | 97 JNIEnv* env, |
96 const JavaParamRef<jobject>& obj, | 98 const JavaParamRef<jobject>& obj, |
97 const JavaParamRef<jintArray>& data_types, | 99 const JavaParamRef<jintArray>& data_types, |
98 jint time_period, | 100 jint time_period, |
99 const JavaParamRef<jobjectArray>& jexcluding_domains, | 101 const JavaParamRef<jobjectArray>& jexcluding_domains, |
100 const JavaParamRef<jintArray>& jexcluding_domain_reasons, | 102 const JavaParamRef<jintArray>& jexcluding_domain_reasons, |
101 const JavaParamRef<jobjectArray>& jignoring_domains, | 103 const JavaParamRef<jobjectArray>& jignoring_domains, |
102 const JavaParamRef<jintArray>& jignoring_domain_reasons) { | 104 const JavaParamRef<jintArray>& jignoring_domain_reasons) { |
103 BrowsingDataRemover* browsing_data_remover = | 105 BrowsingDataRemover* browsing_data_remover = |
104 BrowsingDataRemoverFactory::GetForBrowserContext(GetOriginalProfile()); | 106 content::BrowserContext::GetBrowsingDataRemover(GetOriginalProfile()); |
105 | 107 |
106 std::vector<int> data_types_vector; | 108 std::vector<int> data_types_vector; |
107 base::android::JavaIntArrayToIntVector(env, data_types, &data_types_vector); | 109 base::android::JavaIntArrayToIntVector(env, data_types, &data_types_vector); |
108 | 110 |
109 int remove_mask = 0; | 111 int remove_mask = 0; |
110 for (const int data_type : data_types_vector) { | 112 for (const int data_type : data_types_vector) { |
111 switch (static_cast<browsing_data::BrowsingDataType>(data_type)) { | 113 switch (static_cast<browsing_data::BrowsingDataType>(data_type)) { |
112 case browsing_data::BrowsingDataType::HISTORY: | 114 case browsing_data::BrowsingDataType::HISTORY: |
113 remove_mask |= ChromeBrowsingDataRemoverDelegate::DATA_TYPE_HISTORY; | 115 remove_mask |= ChromeBrowsingDataRemoverDelegate::DATA_TYPE_HISTORY; |
114 break; | 116 break; |
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
278 | 280 |
279 static void MarkOriginAsImportantForTesting( | 281 static void MarkOriginAsImportantForTesting( |
280 JNIEnv* env, | 282 JNIEnv* env, |
281 const JavaParamRef<jclass>& clazz, | 283 const JavaParamRef<jclass>& clazz, |
282 const JavaParamRef<jstring>& jorigin) { | 284 const JavaParamRef<jstring>& jorigin) { |
283 GURL origin(base::android::ConvertJavaStringToUTF8(jorigin)); | 285 GURL origin(base::android::ConvertJavaStringToUTF8(jorigin)); |
284 CHECK(origin.is_valid()); | 286 CHECK(origin.is_valid()); |
285 ImportantSitesUtil::MarkOriginAsImportantForTesting(GetOriginalProfile(), | 287 ImportantSitesUtil::MarkOriginAsImportantForTesting(GetOriginalProfile(), |
286 origin); | 288 origin); |
287 } | 289 } |
OLD | NEW |