Remove calls to deprecated MessageLoop methods in chrome.

chrome/browser/media/combined_desktop_media_list_unittest.cc

 // Copyright 2016 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/media/combined_desktop_media_list.h"
 
 #include "base/message_loop/message_loop.h"
+#include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/media/desktop_media_list_base.h"
 #include "chrome/browser/media/desktop_media_list_observer.h"
 #include "content/public/test/test_browser_thread.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/image/image_skia.h"
 
 using testing::DoAll;
@@ skipping 153 matching lines @@
                     OnSourceThumbnailChanged(combined_list_.get(), i));
       }
 
       EXPECT_CALL(observer_,
                   OnSourceThumbnailChanged(combined_list_.get(),
                                            2 * kDefaultSourceCount - 1))
           .WillOnce(QuitMessageLoop(&message_loop_));
     }
 
     combined_list_->StartUpdating(&observer_);
-    message_loop_.Run();
+    base::RunLoop().Run();
 
     // list1_'s sources.
     for (int i = 0; i < kDefaultSourceCount; ++i) {
       EXPECT_EQ(combined_list_->GetSource(i).id.type,
                 content::DesktopMediaID::TYPE_SCREEN);
       EXPECT_EQ(combined_list_->GetSource(i).id.id, i + 1);
     }
 
     // list2_'s sources.
     for (int i = kDefaultSourceCount; i < 2 * kDefaultSourceCount; i++) {
@@ skipping 25 matching lines @@
   int index = kDefaultSourceCount;
   list1_->AddFakeSource(index, base::UTF8ToUTF16("Test media"), index);
 
   EXPECT_CALL(observer_, OnSourceAdded(combined_list_.get(), index))
       .WillOnce(
           CheckListSize(combined_list_.get(), 2 * kDefaultSourceCount + 1));
   EXPECT_CALL(observer_, OnSourceThumbnailChanged(combined_list_.get(), index))
       .WillOnce(QuitMessageLoop(&message_loop_));
 
   list1_->Refresh();
-  message_loop_.Run();
+  base::RunLoop().Run();
 
   list2_->AddFakeSource(index, base::UTF8ToUTF16("Test media"), index);
 
   EXPECT_CALL(observer_,
               OnSourceAdded(combined_list_.get(), 2 * kDefaultSourceCount + 1))
       .WillOnce(
           CheckListSize(combined_list_.get(), 2 * kDefaultSourceCount + 2));
   EXPECT_CALL(observer_, OnSourceThumbnailChanged(combined_list_.get(),
                                                   2 * kDefaultSourceCount + 1))
       .WillOnce(QuitMessageLoop(&message_loop_));
 
   list2_->Refresh();
-  message_loop_.Run();
+  base::RunLoop().Run();
 
   // Verify last source for list1_ and first source for list2_.
   EXPECT_EQ(combined_list_->GetSource(index).id.type,
             content::DesktopMediaID::TYPE_SCREEN);
   EXPECT_EQ(combined_list_->GetSource(index).id.id, index + 1);
   EXPECT_EQ(combined_list_->GetSource(index + 1).id.type,
             content::DesktopMediaID::TYPE_WINDOW);
   EXPECT_EQ(combined_list_->GetSource(index + 1).id.id, 1);
 }
 
 TEST_F(CombinedDesktopMediaListTest, RemoveSource) {
   InitializeAndVerify();
 
   int index = kDefaultSourceCount - 1;
   list1_->RemoveFakeSource(index);
 
   EXPECT_CALL(observer_, OnSourceRemoved(combined_list_.get(), index))
       .WillOnce(DoAll(
           CheckListSize(combined_list_.get(), 2 * kDefaultSourceCount - 1),
           QuitMessageLoop(&message_loop_)));
 
   list1_->Refresh();
-  message_loop_.Run();
+  base::RunLoop().Run();
 
   list2_->RemoveFakeSource(index);
 
   EXPECT_CALL(observer_, OnSourceRemoved(combined_list_.get(),
                                          2 * kDefaultSourceCount - 2))
       .WillOnce(DoAll(
           CheckListSize(combined_list_.get(), 2 * kDefaultSourceCount - 2),
           QuitMessageLoop(&message_loop_)));
 
   list2_->Refresh();
-  message_loop_.Run();
+  base::RunLoop().Run();
 
   // Verify last source for list1_ and first source for list2_.
   EXPECT_EQ(combined_list_->GetSource(index - 1).id.type,
             content::DesktopMediaID::TYPE_SCREEN);
   EXPECT_EQ(combined_list_->GetSource(index - 1).id.id, index);
   EXPECT_EQ(combined_list_->GetSource(index).id.type,
             content::DesktopMediaID::TYPE_WINDOW);
   EXPECT_EQ(combined_list_->GetSource(index).id.id, 1);
 }
 
 TEST_F(CombinedDesktopMediaListTest, MoveSource) {
   InitializeAndVerify();
 
   // Swap sources.
   list1_->RemoveFakeSource(kDefaultSourceCount - 1);
   list1_->RemoveFakeSource(kDefaultSourceCount - 2);
   list1_->AddFakeSource(kDefaultSourceCount - 1,
                         base::UTF8ToUTF16("Test media"),
                         kDefaultSourceCount - 1);
   list1_->AddFakeSource(kDefaultSourceCount - 2,
                         base::UTF8ToUTF16("Test media"),
                         kDefaultSourceCount - 2);
 
   EXPECT_CALL(observer_,
               OnSourceMoved(combined_list_.get(), kDefaultSourceCount - 1,
                             kDefaultSourceCount - 2))
       .WillOnce(QuitMessageLoop(&message_loop_));
 
   list1_->Refresh();
-  message_loop_.Run();
+  base::RunLoop().Run();
 
   // Swap sources.
   list2_->RemoveFakeSource(kDefaultSourceCount - 1);
   list2_->RemoveFakeSource(kDefaultSourceCount - 2);
   list2_->AddFakeSource(kDefaultSourceCount - 1,
                         base::UTF8ToUTF16("Test media"),
                         kDefaultSourceCount - 1);
   list2_->AddFakeSource(kDefaultSourceCount - 2,
                         base::UTF8ToUTF16("Test media"),
                         kDefaultSourceCount - 2);
 
   EXPECT_CALL(observer_,
               OnSourceMoved(combined_list_.get(), 2 * kDefaultSourceCount - 1,
                             2 * kDefaultSourceCount - 2))
       .WillOnce(QuitMessageLoop(&message_loop_));
 
   list2_->Refresh();
-  message_loop_.Run();
+  base::RunLoop().Run();
 }
 
 TEST_F(CombinedDesktopMediaListTest, UpdateTitle) {
   InitializeAndVerify();
 
   // Change title.
   list1_->RemoveFakeSource(kDefaultSourceCount - 1);
   list1_->AddFakeSource(kDefaultSourceCount - 1,
                         base::UTF8ToUTF16("New test media"),
                         kDefaultSourceCount - 1);
 
   EXPECT_CALL(observer_, OnSourceNameChanged(combined_list_.get(),
                                              kDefaultSourceCount - 1))
       .WillOnce(QuitMessageLoop(&message_loop_));
 
   list1_->Refresh();
-  message_loop_.Run();
+  base::RunLoop().Run();
 
   // Change title.
   list2_->RemoveFakeSource(kDefaultSourceCount - 1);
   list2_->AddFakeSource(kDefaultSourceCount - 1,
                         base::UTF8ToUTF16("New test media"),
                         kDefaultSourceCount - 1);
 
   EXPECT_CALL(observer_, OnSourceNameChanged(combined_list_.get(),
                                              2 * kDefaultSourceCount - 1))
       .WillOnce(QuitMessageLoop(&message_loop_));
 
   list2_->Refresh();
-  message_loop_.Run();
+  base::RunLoop().Run();
 
   EXPECT_EQ(combined_list_->GetSource(kDefaultSourceCount - 1).name,
             base::UTF8ToUTF16("New test media"));
   EXPECT_EQ(combined_list_->GetSource(2 * kDefaultSourceCount - 1).name,
             base::UTF8ToUTF16("New test media"));
 }
 
 TEST_F(CombinedDesktopMediaListTest, UpdateThumbnail) {
   InitializeAndVerify();
 
   // Change thumbnail.
   list1_->RemoveFakeSource(kDefaultSourceCount - 1);
   list1_->AddFakeSource(kDefaultSourceCount - 1,
                         base::UTF8ToUTF16("Test media"), 100);
 
   EXPECT_CALL(observer_, OnSourceThumbnailChanged(combined_list_.get(),
                                                   kDefaultSourceCount - 1))
       .WillOnce(QuitMessageLoop(&message_loop_));
 
   list1_->Refresh();
-  message_loop_.Run();
+  base::RunLoop().Run();
 
   // Change thumbnail.
   list2_->RemoveFakeSource(kDefaultSourceCount - 1);
   list2_->AddFakeSource(kDefaultSourceCount - 1,
                         base::UTF8ToUTF16("Test media"), 100);
 
   EXPECT_CALL(observer_, OnSourceThumbnailChanged(combined_list_.get(),
                                                   2 * kDefaultSourceCount - 1))
       .WillOnce(QuitMessageLoop(&message_loop_));
 
   list2_->Refresh();
-  message_loop_.Run();
+  base::RunLoop().Run();
 }