Remove deprecated API usage in chrome/browser/policy/ tests.

Bug: 1033439
Change-Id: I120e7c80f9a8a2f927f6aee0a57c8f3aa56614ab
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2036181Reviewed-by: Sergey Poromov <poromov@chromium.org>
Commit-Queue: Sergey Poromov <poromov@chromium.org>
Auto-Submit: Vladislav Kuzkokov <vkuzkokov@chromium.org>
Cr-Commit-Position: refs/heads/master@{#738531}

chrome/browser/policy/component_updater_policy_browsertest.cc

@@ -70,6 +70,7 @@ class ComponentUpdaterPolicyTest : public PolicyTest {
       bool supports_group_policy_enable_component_updates);
 
   TestCase cur_test_case_;
+  base::RepeatingClosure quit_closure_;
 
   static const char component_id_[];
 
@@ -212,9 +213,7 @@ void ComponentUpdaterPolicyTest::BeginTest() {
 void ComponentUpdaterPolicyTest::EndTest() {
   post_interceptor_.reset();
   cus_ = nullptr;
-  // TODO(crbug.com/1033439): replace QuitCurrentWhenIdleDeprecated with RunLoop
-  // instance instead
-  base::RunLoop::QuitCurrentWhenIdleDeprecated();
+  quit_closure_.Run();
 }
 
 void ComponentUpdaterPolicyTest::VerifyExpectations(bool update_disabled) {
@@ -339,7 +338,9 @@ void ComponentUpdaterPolicyTest::
 
 IN_PROC_BROWSER_TEST_F(ComponentUpdaterPolicyTest, EnabledComponentUpdates) {
   BeginTest();
-  base::RunLoop().Run();
+  base::RunLoop loop;
+  quit_closure_ = loop.QuitWhenIdleClosure();
+  loop.Run();
 }
 
 }  // namespace policy

chrome/browser/policy/media_stream_policy_browsertest.cc

@@ -120,10 +120,7 @@ class MediaStreamDevicesControllerBrowserTest
     MediaStreamDevicesController::RequestPermissions(
         request, base::Bind(&MediaStreamDevicesControllerBrowserTest::Accept,
                             base::Unretained(this)));
-    // TODO(crbug.com/1033439): replace QuitCurrentWhenIdleDeprecated with
-    // RunLoop
-    // instance instead
-    base::RunLoop::QuitCurrentWhenIdleDeprecated();
+    quit_closure_.Run();
   }
 
   void FinishVideoTest() {
@@ -135,9 +132,7 @@ class MediaStreamDevicesControllerBrowserTest
     MediaStreamDevicesController::RequestPermissions(
         request, base::Bind(&MediaStreamDevicesControllerBrowserTest::Accept,
                             base::Unretained(this)));
-    // TODO(crbug.com/1033439): replace QuitCurrentWhenIdleDeprecated with
-    // RunLoop instance instead
-    base::RunLoop::QuitCurrentWhenIdleDeprecated();
+    quit_closure_.Run();
   }
 
   std::unique_ptr<MockPermissionPromptFactory> prompt_factory_;
@@ -145,6 +140,7 @@ class MediaStreamDevicesControllerBrowserTest
   bool request_url_allowed_via_whitelist_;
   GURL request_url_;
   std::string request_pattern_;
+  base::RepeatingClosure quit_closure_;
 };
 
 IN_PROC_BROWSER_TEST_P(MediaStreamDevicesControllerBrowserTest,
@@ -168,7 +164,9 @@ IN_PROC_BROWSER_TEST_P(MediaStreamDevicesControllerBrowserTest,
       base::BindOnce(&MediaStreamDevicesControllerBrowserTest::FinishAudioTest,
                      base::Unretained(this)));
 
-  base::RunLoop().Run();
+  base::RunLoop loop;
+  quit_closure_ = loop.QuitWhenIdleClosure();
+  loop.Run();
 }
 
 IN_PROC_BROWSER_TEST_P(MediaStreamDevicesControllerBrowserTest,
@@ -203,7 +201,9 @@ IN_PROC_BROWSER_TEST_P(MediaStreamDevicesControllerBrowserTest,
             &MediaStreamDevicesControllerBrowserTest::FinishAudioTest,
             base::Unretained(this)));
 
-    base::RunLoop().Run();
+    base::RunLoop loop;
+    quit_closure_ = loop.QuitWhenIdleClosure();
+    loop.Run();
   }
 }
 
@@ -228,7 +228,9 @@ IN_PROC_BROWSER_TEST_P(MediaStreamDevicesControllerBrowserTest,
       base::BindOnce(&MediaStreamDevicesControllerBrowserTest::FinishVideoTest,
                      base::Unretained(this)));
 
-  base::RunLoop().Run();
+  base::RunLoop loop;
+  quit_closure_ = loop.QuitWhenIdleClosure();
+  loop.Run();
 }
 
 IN_PROC_BROWSER_TEST_P(MediaStreamDevicesControllerBrowserTest,
@@ -263,7 +265,9 @@ IN_PROC_BROWSER_TEST_P(MediaStreamDevicesControllerBrowserTest,
             &MediaStreamDevicesControllerBrowserTest::FinishVideoTest,
             base::Unretained(this)));
 
-    base::RunLoop().Run();
+    base::RunLoop loop;
+    quit_closure_ = loop.QuitWhenIdleClosure();
+    loop.Run();
   }
 }