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

Unified Diff: chrome/browser/supervised_user/supervised_user_content_provider_android.cc

Issue 2237943002: Remove now-unnecessary .obj() in Java method calls. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@switch-context
Patch Set: Rebase *again* :( Created 4 years, 4 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/supervised_user/supervised_user_content_provider_android.cc
diff --git a/chrome/browser/supervised_user/supervised_user_content_provider_android.cc b/chrome/browser/supervised_user/supervised_user_content_provider_android.cc
index 88b902725dfdbc0628e5ad85dceb0c6d65b38f87..e328d08fd9cd6809553c1f8753bbb84c8f088a3e 100644
--- a/chrome/browser/supervised_user/supervised_user_content_provider_android.cc
+++ b/chrome/browser/supervised_user/supervised_user_content_provider_android.cc
@@ -33,7 +33,7 @@ class UrlFilterObserver : public SupervisedUserURLFilter::Observer {
private:
void OnSiteListUpdated() override {
Java_SupervisedUserContentProvider_onSupervisedUserFilterUpdated(
- AttachCurrentThread(), java_content_provider_.obj());
+ AttachCurrentThread(), java_content_provider_);
}
ScopedJavaGlobalRef<jobject> java_content_provider_;
};
@@ -71,7 +71,7 @@ void SupervisedUserContentProvider::ShouldProceed(
const JavaParamRef<jstring>& url) {
if (!profile_->IsSupervised()) {
// User isn't supervised
- Java_SupervisedUserQueryReply_onQueryComplete(env, query_result_jobj.obj());
+ Java_SupervisedUserQueryReply_onQueryComplete(env, query_result_jobj);
return;
}
SupervisedUserService* supervised_user_service =
@@ -108,33 +108,28 @@ void SupervisedUserContentProvider::OnQueryComplete(
bool /* uncertain */) {
if (behavior != SupervisedUserURLFilter::BLOCK) {
Java_SupervisedUserQueryReply_onQueryComplete(AttachCurrentThread(),
- query_reply_jobj.obj());
+ query_reply_jobj);
} else {
JNIEnv* env = AttachCurrentThread();
SupervisedUserService* service =
SupervisedUserServiceFactory::GetForProfile(profile_);
Java_SupervisedUserQueryReply_onQueryFailed(
- env, query_reply_jobj.obj(), reason, service->AccessRequestsEnabled(),
+ env, query_reply_jobj, reason, service->AccessRequestsEnabled(),
profile_->IsChild(),
base::android::ConvertUTF8ToJavaString(
env, profile_->GetPrefs()->GetString(
- prefs::kSupervisedUserCustodianProfileImageURL))
- .obj(),
+ prefs::kSupervisedUserCustodianProfileImageURL)),
base::android::ConvertUTF8ToJavaString(
env, profile_->GetPrefs()->GetString(
- prefs::kSupervisedUserSecondCustodianProfileImageURL))
- .obj(),
- base::android::ConvertUTF8ToJavaString(env, service->GetCustodianName())
- .obj(),
+ prefs::kSupervisedUserSecondCustodianProfileImageURL)),
+ base::android::ConvertUTF8ToJavaString(env,
+ service->GetCustodianName()),
base::android::ConvertUTF8ToJavaString(
- env, service->GetCustodianEmailAddress())
- .obj(),
+ env, service->GetCustodianEmailAddress()),
base::android::ConvertUTF8ToJavaString(
- env, service->GetSecondCustodianName())
- .obj(),
+ env, service->GetSecondCustodianName()),
base::android::ConvertUTF8ToJavaString(
- env, service->GetSecondCustodianEmailAddress())
- .obj());
+ env, service->GetSecondCustodianEmailAddress()));
}
}
@@ -153,7 +148,7 @@ void SupervisedUserContentProvider::OnInsertRequestSendComplete(
ScopedJavaGlobalRef<jobject> insert_reply_jobj,
bool sent_ok) {
Java_SupervisedUserInsertReply_onInsertRequestSendComplete(
- AttachCurrentThread(), insert_reply_jobj.obj(), sent_ok);
+ AttachCurrentThread(), insert_reply_jobj, sent_ok);
}
bool SupervisedUserContentProvider::Register(JNIEnv* env) {

Powered by Google App Engine
This is Rietveld 408576698