MediaStreamDevicesControllerBrowserTest

chrome/browser/permissions/permission_request_manager_browsertest.cc

Index: chrome/browser/permissions/permission_request_manager_browsertest.cc
diff --git a/chrome/browser/permissions/permission_request_manager_browsertest.cc b/chrome/browser/permissions/permission_request_manager_browsertest.cc
index c5700d371a2fd18b632e8bece97137b0d7e2d027..e4368f3a59da540826dbc27d9c96113f4834ed06 100644
--- a/chrome/browser/permissions/permission_request_manager_browsertest.cc
+++ b/chrome/browser/permissions/permission_request_manager_browsertest.cc
@@ -286,7 +286,7 @@ IN_PROC_BROWSER_TEST_F(PermissionRequestManagerBrowserTest,
   bubble_factory()->WaitForPermissionBubble();
 
   EXPECT_EQ(1, bubble_factory()->show_count());
-  EXPECT_EQ(2, bubble_factory()->total_request_count());
+  EXPECT_EQ(2, bubble_factory()->TotalRequestCount());
 }
 
 // Requests before the load should not be bundled with a request after the load.
@@ -302,7 +302,7 @@ IN_PROC_BROWSER_TEST_F(PermissionRequestManagerBrowserTest,
   bubble_factory()->WaitForPermissionBubble();
 
   EXPECT_EQ(1, bubble_factory()->show_count());
-  EXPECT_EQ(1, bubble_factory()->total_request_count());
+  EXPECT_EQ(1, bubble_factory()->TotalRequestCount());
 }
 
 // Navigating twice to the same URL should be equivalent to refresh. This means
@@ -329,7 +329,7 @@ IN_PROC_BROWSER_TEST_F(PermissionRequestManagerBrowserTest, MAYBE_NavTwice) {
   bubble_factory()->WaitForPermissionBubble();
 
   EXPECT_EQ(2, bubble_factory()->show_count());
-  EXPECT_EQ(4, bubble_factory()->total_request_count());
+  EXPECT_EQ(4, bubble_factory()->TotalRequestCount());
 }
 
 // Navigating twice to the same URL with a hash should be navigation within the
@@ -358,7 +358,7 @@ IN_PROC_BROWSER_TEST_F(PermissionRequestManagerBrowserTest,
   bubble_factory()->WaitForPermissionBubble();
 
   EXPECT_EQ(1, bubble_factory()->show_count());
-  EXPECT_EQ(2, bubble_factory()->total_request_count());
+  EXPECT_EQ(2, bubble_factory()->TotalRequestCount());
 }
 
 // Bubble requests should be shown after in-page navigation.
@@ -382,7 +382,7 @@ IN_PROC_BROWSER_TEST_F(PermissionRequestManagerBrowserTest, InPageNavigation) {
   bubble_factory()->WaitForPermissionBubble();
 
   EXPECT_EQ(1, bubble_factory()->show_count());
-  EXPECT_EQ(1, bubble_factory()->total_request_count());
+  EXPECT_EQ(1, bubble_factory()->TotalRequestCount());
 }
 
 // Bubble requests should not be shown when the killswitch is on.
@@ -404,7 +404,7 @@ IN_PROC_BROWSER_TEST_F(PermissionRequestManagerBrowserTest,
       web_contents, "requestGeolocation();", &result));
   EXPECT_EQ("denied", result);
   EXPECT_EQ(0, bubble_factory()->show_count());
-  EXPECT_EQ(0, bubble_factory()->total_request_count());
+  EXPECT_EQ(0, bubble_factory()->TotalRequestCount());
 
   // Disable the trial.
   variations::testing::ClearAllVariationParams();
@@ -418,7 +418,7 @@ IN_PROC_BROWSER_TEST_F(PermissionRequestManagerBrowserTest,
   EXPECT_TRUE(content::ExecuteScript(web_contents, "requestGeolocation();"));
   bubble_factory()->WaitForPermissionBubble();
   EXPECT_EQ(1, bubble_factory()->show_count());
-  EXPECT_EQ(1, bubble_factory()->total_request_count());
+  EXPECT_EQ(1, bubble_factory()->TotalRequestCount());
 }
 
 // Bubble requests should not be shown when the killswitch is on.
@@ -440,7 +440,7 @@ IN_PROC_BROWSER_TEST_F(PermissionRequestManagerBrowserTest,
       web_contents, "requestNotification();", &result));
   EXPECT_EQ("denied", result);
   EXPECT_EQ(0, bubble_factory()->show_count());
-  EXPECT_EQ(0, bubble_factory()->total_request_count());
+  EXPECT_EQ(0, bubble_factory()->TotalRequestCount());
 
   // Disable the trial.
   variations::testing::ClearAllVariationParams();
@@ -448,7 +448,7 @@ IN_PROC_BROWSER_TEST_F(PermissionRequestManagerBrowserTest,
   EXPECT_TRUE(content::ExecuteScript(web_contents, "requestNotification();"));
   bubble_factory()->WaitForPermissionBubble();
   EXPECT_EQ(1, bubble_factory()->show_count());
-  EXPECT_EQ(1, bubble_factory()->total_request_count());
+  EXPECT_EQ(1, bubble_factory()->TotalRequestCount());
 }
 
 // Host wants to run flash.