Remove calls to deprecated MessageLoop methods in chrome.

chrome/browser/history/android/sqlite_cursor_unittest.cc

 // Copyright (c) 2012 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 "chrome/browser/history/android/sqlite_cursor.h"
 
 #include <jni.h>
 #include <stdint.h>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/macros.h"
+#include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/task/cancelable_task_tracker.h"
 #include "base/time/time.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/history/android/android_history_provider_service.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chrome/test/base/testing_profile_manager.h"
@@ skipping 49 matching lines @@
         testing_profile_, ServiceAccessType::EXPLICIT_ACCESS);
   }
 
   void TearDown() override {
     testing_profile_->DestroyHistoryService();
     profile_manager_.DeleteTestingProfile(chrome::kInitialProfile);
     testing_profile_ = NULL;
   }
 
   // Override SQLiteCursor::TestObserver.
-  void OnPostMoveToTask() override { base::MessageLoop::current()->Run(); }
+  void OnPostMoveToTask() override {
+    ASSERT_FALSE(run_loop_);
+    run_loop_ = base::MakeUnique<base::RunLoop>();
+    run_loop_->Run();
+    run_loop_ = nullptr;
+  }
 
   void OnGetMoveToResult() override {
-    base::MessageLoop::current()->QuitWhenIdle();
+    ASSERT_TRUE(run_loop_);
+    run_loop_->QuitWhenIdle();
   }
 
-  void OnPostGetFaviconTask() override { base::MessageLoop::current()->Run(); }
+  void OnPostGetFaviconTask() override {
+    ASSERT_FALSE(run_loop_);
+    run_loop_ = base::MakeUnique<base::RunLoop>();
+    run_loop_->Run();
+    run_loop_ = nullptr;
+  }
 
   void OnGetFaviconResult() override {
-    base::MessageLoop::current()->QuitWhenIdle();
+    ASSERT_TRUE(run_loop_);
+    run_loop_->QuitWhenIdle();
   }
 
  protected:
   TestingProfileManager profile_manager_;
   base::MessageLoop message_loop_;
   content::TestBrowserThread ui_thread_;
   content::TestBrowserThread file_thread_;
   std::unique_ptr<AndroidHistoryProviderService> service_;
   base::CancelableTaskTracker cancelable_tracker_;
   TestingProfile* testing_profile_;
   history::HistoryService* hs_;
+  std::unique_ptr<base::RunLoop> run_loop_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(SQLiteCursorTest);
 };
 
 class CallbackHelper : public base::RefCountedThreadSafe<CallbackHelper> {
  public:
   CallbackHelper()
       : success_(false),
         statement_(NULL) {
@@ skipping 44 matching lines @@
   row.set_visit_count(2);
   row.set_title(base::UTF8ToUTF16("cnn"));
   scoped_refptr<CallbackHelper> callback(new CallbackHelper());
 
   // Insert a row and verify it succeeded.
   service_->InsertHistoryAndBookmark(
       row,
       Bind(&CallbackHelper::OnInserted, callback.get()),
       &cancelable_tracker_);
 
-  base::MessageLoop::current()->Run();
+  base::RunLoop().Run();
   EXPECT_TRUE(callback->success());
 
   std::vector<HistoryAndBookmarkRow::ColumnID> projections;
   projections.push_back(HistoryAndBookmarkRow::URL);
   projections.push_back(HistoryAndBookmarkRow::LAST_VISIT_TIME);
   projections.push_back(HistoryAndBookmarkRow::VISIT_COUNT);
   projections.push_back(HistoryAndBookmarkRow::FAVICON);
 
   // Query the inserted row.
   service_->QueryHistoryAndBookmarks(
       projections,
       std::string(),
       std::vector<base::string16>(),
       std::string(),
       Bind(&CallbackHelper::OnQueryResult, callback.get()),
       &cancelable_tracker_);
-  base::MessageLoop::current()->Run();
+  base::RunLoop().Run();
   ASSERT_TRUE(callback->success());
 
   AndroidStatement* statement = callback->statement();
   std::vector<std::string> column_names;
   column_names.push_back(
       HistoryAndBookmarkRow::GetAndroidName(HistoryAndBookmarkRow::URL));
   column_names.push_back(HistoryAndBookmarkRow::GetAndroidName(
       HistoryAndBookmarkRow::LAST_VISIT_TIME));
   column_names.push_back(HistoryAndBookmarkRow::GetAndroidName(
       HistoryAndBookmarkRow::VISIT_COUNT));
@@ skipping 15 matching lines @@
       cursor->GetBlob(env, NULL, 3);
   std::vector<uint8_t> out;
   base::android::JavaByteArrayToByteVector(env, data.obj(), &out);
   EXPECT_EQ(data_bytes->data().size(), out.size());
   EXPECT_EQ(data_bytes->data()[0], out[0]);
   cursor->Destroy(env, NULL);
   // Cursor::Destroy posts the task in UI thread, run Message loop to release
   // the statement, delete SQLiteCursor itself etc.
   content::RunAllPendingInMessageLoop();
 }