Attaches OfflineContentAggregator to Profile

components/offline_items_collection/core/android/offline_content_aggregator_bridge.cc

 // Copyright 2017 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/offline_items_collection/core/android/offline_content_aggregator_bridge.h"
 
 #include "base/android/jni_string.h"
 #include "components/offline_items_collection/core/android/offline_item_bridge.h"
 #include "components/offline_items_collection/core/offline_item.h"
 #include "jni/OfflineContentAggregatorBridge_jni.h"
@@ skipping 18 matching lines @@
 }
 
 }  // namespace
 
 // static.
 bool OfflineContentAggregatorBridge::Register(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 // static
-OfflineContentAggregatorBridge*
-OfflineContentAggregatorBridge::GetForOfflineContentAggregator(
+base::android::ScopedJavaLocalRef<jobject>
+OfflineContentAggregatorBridge::GetBridgeForOfflineContentAggregator(
     OfflineContentAggregator* aggregator) {
   if (!aggregator->GetUserData(kOfflineContentAggregatorBridgeUserDataKey)) {
     aggregator->SetUserData(kOfflineContentAggregatorBridgeUserDataKey,
                             new OfflineContentAggregatorBridge(aggregator));
   }
+  OfflineContentAggregatorBridge* bridge =
+      static_cast<OfflineContentAggregatorBridge*>(
+          aggregator->GetUserData(kOfflineContentAggregatorBridgeUserDataKey));
 
-  return static_cast<OfflineContentAggregatorBridge*>(
-      aggregator->GetUserData(kOfflineContentAggregatorBridgeUserDataKey));
+  return ScopedJavaLocalRef<jobject>(bridge->java_ref_);
 }
 
 OfflineContentAggregatorBridge::OfflineContentAggregatorBridge(
     OfflineContentAggregator* aggregator)
     : aggregator_(aggregator) {
   JNIEnv* env = AttachCurrentThread();
   java_ref_.Reset(Java_OfflineContentAggregatorBridge_create(
       env, reinterpret_cast<intptr_t>(this)));
 
   aggregator_->AddObserver(this);
@@ skipping 106 matching lines @@
   if (java_ref_.is_null())
     return;
 
   JNIEnv* env = AttachCurrentThread();
   Java_OfflineContentAggregatorBridge_onItemUpdated(
       env, java_ref_.obj(), OfflineItemBridge::CreateOfflineItem(env, &item));
 }
 
 }  // namespace android
 }  // namespace offline_items_collection