Migrate feature_engagement::Tracker::OnInitializedCallback to OnceCallback.

Bug: 714018
Change-Id: I2085e52ccd2e6f9205a0dc7b10bd9dd7c519ae84
Reviewed-on: https://chromium-review.googlesource.com/1117468Reviewed-by: Tommy Nyquist <nyquist@chromium.org>
Commit-Queue: Sky Malice <skym@chromium.org>
Cr-Commit-Position: refs/heads/master@{#571645}

components/feature_engagement/internal/android/tracker_impl_android.cc

@@ -162,9 +162,9 @@ void TrackerImplAndroid::AddOnInitializedCallback(
   // Disambiguate RunCallbackAndroid to get the reference to the bool version.
   void (*runBoolCallback)(const base::android::JavaRef<jobject>&, bool) =
       &base::android::RunCallbackAndroid;
-  tracker_impl_->AddOnInitializedCallback(
-      base::Bind(runBoolCallback,
-                 base::android::ScopedJavaGlobalRef<jobject>(j_callback_obj)));
+  tracker_impl_->AddOnInitializedCallback(base::BindOnce(
+      runBoolCallback,
+      base::android::ScopedJavaGlobalRef<jobject>(j_callback_obj)));
 }
 
 DisplayLockHandleAndroid::DisplayLockHandleAndroid(

components/feature_engagement/internal/tracker_impl.cc

@@ -248,11 +248,11 @@ bool TrackerImpl::IsInitialized() const {
 void TrackerImpl::AddOnInitializedCallback(OnInitializedCallback callback) {
   if (IsInitializationFinished()) {
     base::ThreadTaskRunnerHandle::Get()->PostTask(
-        FROM_HERE, base::Bind(callback, IsInitialized()));
+        FROM_HERE, base::BindOnce(std::move(callback), IsInitialized()));
     return;
   }
 
-  on_initialized_callbacks_.push_back(callback);
+  on_initialized_callbacks_.push_back(std::move(callback));
 }
 
 void TrackerImpl::OnEventModelInitializationFinished(bool success) {
@@ -286,7 +286,7 @@ void TrackerImpl::MaybePostInitializedCallbacks() {
 
   for (auto& callback : on_initialized_callbacks_) {
     base::ThreadTaskRunnerHandle::Get()->PostTask(
-        FROM_HERE, base::Bind(callback, IsInitialized()));
+        FROM_HERE, base::BindOnce(std::move(callback), IsInitialized()));
   }
 
   on_initialized_callbacks_.clear();

components/feature_engagement/internal/tracker_impl_unittest.cc

@@ -4,6 +4,7 @@
 
 #include "components/feature_engagement/internal/tracker_impl.h"
 
+#include <map>
 #include <memory>
 #include <utility>
 
@@ -458,7 +459,7 @@ TEST_F(TrackerImplTest, TestInitialization) {
   EXPECT_FALSE(tracker_->IsInitialized());
 
   StoringInitializedCallback callback;
-  tracker_->AddOnInitializedCallback(base::Bind(
+  tracker_->AddOnInitializedCallback(base::BindOnce(
       &StoringInitializedCallback::OnInitialized, base::Unretained(&callback)));
   EXPECT_FALSE(callback.invoked());
 
@@ -477,11 +478,11 @@ TEST_F(TrackerImplTest, TestInitializationMultipleCallbacks) {
   StoringInitializedCallback callback2;
 
   tracker_->AddOnInitializedCallback(
-      base::Bind(&StoringInitializedCallback::OnInitialized,
-                 base::Unretained(&callback1)));
+      base::BindOnce(&StoringInitializedCallback::OnInitialized,
+                     base::Unretained(&callback1)));
   tracker_->AddOnInitializedCallback(
-      base::Bind(&StoringInitializedCallback::OnInitialized,
-                 base::Unretained(&callback2)));
+      base::BindOnce(&StoringInitializedCallback::OnInitialized,
+                     base::Unretained(&callback2)));
   EXPECT_FALSE(callback1.invoked());
   EXPECT_FALSE(callback2.invoked());
 
@@ -504,7 +505,7 @@ TEST_F(TrackerImplTest, TestAddingCallbackAfterInitFinished) {
   EXPECT_TRUE(tracker_->IsInitialized());
 
   StoringInitializedCallback callback;
-  tracker_->AddOnInitializedCallback(base::Bind(
+  tracker_->AddOnInitializedCallback(base::BindOnce(
       &StoringInitializedCallback::OnInitialized, base::Unretained(&callback)));
   EXPECT_FALSE(callback.invoked());
 
@@ -523,8 +524,8 @@ TEST_F(TrackerImplTest, TestAddingCallbackBeforeAndAfterInitFinished) {
 
   StoringInitializedCallback callback_before;
   tracker_->AddOnInitializedCallback(
-      base::Bind(&StoringInitializedCallback::OnInitialized,
-                 base::Unretained(&callback_before)));
+      base::BindOnce(&StoringInitializedCallback::OnInitialized,
+                     base::Unretained(&callback_before)));
   EXPECT_FALSE(callback_before.invoked());
 
   base::RunLoop().RunUntilIdle();
@@ -533,8 +534,8 @@ TEST_F(TrackerImplTest, TestAddingCallbackBeforeAndAfterInitFinished) {
 
   StoringInitializedCallback callback_after;
   tracker_->AddOnInitializedCallback(
-      base::Bind(&StoringInitializedCallback::OnInitialized,
-                 base::Unretained(&callback_after)));
+      base::BindOnce(&StoringInitializedCallback::OnInitialized,
+                     base::Unretained(&callback_after)));
   EXPECT_FALSE(callback_after.invoked());
 
   base::RunLoop().RunUntilIdle();
@@ -546,7 +547,7 @@ TEST_F(FailingStoreInitTrackerImplTest, TestFailingInitialization) {
   EXPECT_FALSE(tracker_->IsInitialized());
 
   StoringInitializedCallback callback;
-  tracker_->AddOnInitializedCallback(base::Bind(
+  tracker_->AddOnInitializedCallback(base::BindOnce(
       &StoringInitializedCallback::OnInitialized, base::Unretained(&callback)));
   EXPECT_FALSE(callback.invoked());
 
@@ -565,11 +566,11 @@ TEST_F(FailingStoreInitTrackerImplTest,
   StoringInitializedCallback callback1;
   StoringInitializedCallback callback2;
   tracker_->AddOnInitializedCallback(
-      base::Bind(&StoringInitializedCallback::OnInitialized,
-                 base::Unretained(&callback1)));
+      base::BindOnce(&StoringInitializedCallback::OnInitialized,
+                     base::Unretained(&callback1)));
   tracker_->AddOnInitializedCallback(
-      base::Bind(&StoringInitializedCallback::OnInitialized,
-                 base::Unretained(&callback2)));
+      base::BindOnce(&StoringInitializedCallback::OnInitialized,
+                     base::Unretained(&callback2)));
   EXPECT_FALSE(callback1.invoked());
   EXPECT_FALSE(callback2.invoked());
 
@@ -587,7 +588,7 @@ TEST_F(FailingAvailabilityModelInitTrackerImplTest, AvailabilityModelNotReady) {
   EXPECT_FALSE(tracker_->IsInitialized());
 
   StoringInitializedCallback callback;
-  tracker_->AddOnInitializedCallback(base::Bind(
+  tracker_->AddOnInitializedCallback(base::BindOnce(
       &StoringInitializedCallback::OnInitialized, base::Unretained(&callback)));
   EXPECT_FALSE(callback.invoked());
 
@@ -602,7 +603,7 @@ TEST_F(FailingAvailabilityModelInitTrackerImplTest, AvailabilityModelNotReady) {
 TEST_F(TrackerImplTest, TestTriggering) {
   // Ensure all initialization is finished.
   StoringInitializedCallback callback;
-  tracker_->AddOnInitializedCallback(base::Bind(
+  tracker_->AddOnInitializedCallback(base::BindOnce(
       &StoringInitializedCallback::OnInitialized, base::Unretained(&callback)));
   base::RunLoop().RunUntilIdle();
   base::UserActionTester user_action_tester;
@@ -671,7 +672,7 @@ TEST_F(TrackerImplTest, TestTriggering) {
 TEST_F(TrackerImplTest, TestTrackingOnlyTriggering) {
   // Ensure all initialization is finished.
   StoringInitializedCallback callback;
-  tracker_->AddOnInitializedCallback(base::Bind(
+  tracker_->AddOnInitializedCallback(base::BindOnce(
       &StoringInitializedCallback::OnInitialized, base::Unretained(&callback)));
   base::RunLoop().RunUntilIdle();
   base::UserActionTester user_action_tester;
@@ -720,7 +721,7 @@ TEST_F(TrackerImplTest, TestTrackingOnlyTriggering) {
 TEST_F(TrackerImplTest, TestWouldTriggerInspection) {
   // Ensure all initialization is finished.
   StoringInitializedCallback callback;
-  tracker_->AddOnInitializedCallback(base::Bind(
+  tracker_->AddOnInitializedCallback(base::BindOnce(
       &StoringInitializedCallback::OnInitialized, base::Unretained(&callback)));
   base::RunLoop().RunUntilIdle();
   base::UserActionTester user_action_tester;
@@ -782,7 +783,7 @@ TEST_F(TrackerImplTest, TestTriggerStateInspection) {
 
   // Ensure all initialization is finished.
   StoringInitializedCallback callback;
-  tracker_->AddOnInitializedCallback(base::Bind(
+  tracker_->AddOnInitializedCallback(base::BindOnce(
       &StoringInitializedCallback::OnInitialized, base::Unretained(&callback)));
   base::RunLoop().RunUntilIdle();
   base::UserActionTester user_action_tester;
@@ -823,7 +824,7 @@ TEST_F(TrackerImplTest, TestTriggerStateInspection) {
 
 TEST_F(TrackerImplTest, TestNotifyEvent) {
   StoringInitializedCallback callback;
-  tracker_->AddOnInitializedCallback(base::Bind(
+  tracker_->AddOnInitializedCallback(base::BindOnce(
       &StoringInitializedCallback::OnInitialized, base::Unretained(&callback)));
   base::RunLoop().RunUntilIdle();
   base::UserActionTester user_action_tester;

components/feature_engagement/public/tracker.h

@@ -65,7 +65,7 @@ class Tracker : public KeyedService {
   // Invoked when the tracker has been initialized. The |success| parameter
   // indicates that the initialization was a success and the tracker is ready to
   // receive calls.
-  using OnInitializedCallback = base::Callback<void(bool success)>;
+  using OnInitializedCallback = base::OnceCallback<void(bool success)>;
 
   // The |storage_dir| is the path to where all local storage will be.
   // The |bakground_task_runner| will be used for all disk reads and writes.