Revert of Revert: Per navigation sticky media permissions.

chrome/browser/media/chrome_media_stream_infobar_browsertest.cc

 // Copyright 2013 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 "base/command_line.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
@@ skipping 134 matching lines @@
                        MAYBE_TestAcceptThenDenyWhichShouldBeSticky) {
 #if defined(OS_WIN) && defined(USE_ASH)
   // Disable this test in Metro+Ash for now (http://crbug.com/262796).
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
     return;
 #endif
 
   content::WebContents* tab_contents = LoadTestPageInTab();
 
   GetUserMediaAndAccept(tab_contents);
-  GetUserMediaAndDeny(tab_contents);
+  DenyRequest(tab_contents, content::MEDIA_DEVICE_PERMISSION_DENIED);
 
   // Should fail with permission denied right away with no infobar popping up.
   GetUserMedia(tab_contents, kAudioVideoCallConstraints);
   EXPECT_TRUE(test::PollingWaitUntil("obtainGetUserMediaResult()",
                                      kFailedWithPermissionDeniedError,
                                      tab_contents));
   InfoBarService* infobar_service =
       InfoBarService::FromWebContents(tab_contents);
   EXPECT_EQ(0u, infobar_service->infobar_count());
 }
 
 // Failing on Win Aura, so disabling on that.
 // See http://crbug.com/263333.
 #if defined(USE_AURA)
 #define MAYBE_TestAcceptIsNotSticky DISABLED_TestAcceptIsNotSticky
 #else
 #define MAYBE_TestAcceptIsNotSticky TestAcceptIsNotSticky
 #endif
 IN_PROC_BROWSER_TEST_F(MediaStreamInfoBarTest, MAYBE_TestAcceptIsNotSticky) {
   content::WebContents* tab_contents = LoadTestPageInTab();
 
   // If accept were sticky the second call would hang because it hangs if an
   // infobar does not pop up.
   GetUserMediaAndAccept(tab_contents);
+
+  // Because http request permissions are sticky per navigation, we need to
+  // navigate away from the current page in order to verify that the granted
+  // permissions are not permanently sticky.
+  ui_test_utils::NavigateToURLBlockUntilNavigationsComplete(browser(),
+      GURL("about:blank"), 1);
+
+  // Now navigate back to our test page.
+  ui_test_utils::NavigateToURL(browser(), test_page_url());
+  tab_contents = browser()->tab_strip_model()->GetActiveWebContents();
+
   GetUserMediaAndAccept(tab_contents);
 }
 
+// Test that accepting one getUserMedia request will not require a second
+// prompt when issuing a second getUserMedia request.
+IN_PROC_BROWSER_TEST_F(MediaStreamInfoBarTest,
+                       TestAcceptIsStickyPerNavigation) {
+  content::WebContents* tab_contents = LoadTestPageInTab();
+
+  GetUserMediaAndAccept(tab_contents);
+
+  // Before issuing the second gUM request, make sure we first stop the tracks
+  // we started with the first request. If they're still running the permissions
+  // will be active for other reasons and we won't be testing the temporary
+  // stickiness properly.
+  EXPECT_TRUE(StopLocalStream(tab_contents));
+
+  // Now no media tracks are running, so let's issue the second request.
+  GetUserMedia(tab_contents, kAudioVideoCallConstraints);
+}
+
+IN_PROC_BROWSER_TEST_F(MediaStreamInfoBarTest,
+                       TestTwoAcceptsPlusStickyPerNavigation) {
+  content::WebContents* tab_contents = LoadTestPageInTab();
+
+  // First ask for audio only and approve.
+  GetUserMediaWithSpecificConstraintsAndAccept(tab_contents,
+                                               kAudioOnlyCallConstraints);
+  EXPECT_TRUE(StopLocalStream(tab_contents));
+
+  // Next ask for video permissions.
+  // This will hang if the previous gUM call somehow gave video permissions.
+  GetUserMediaWithSpecificConstraintsAndAccept(tab_contents,
+                                               kVideoOnlyCallConstraints);
+  EXPECT_TRUE(StopLocalStream(tab_contents));
+
+  // Now ask for both audio and video and expect the call to go through without
+  // showing any UI.
+  GetUserMedia(tab_contents, kAudioVideoCallConstraints);
+}
+
 IN_PROC_BROWSER_TEST_F(MediaStreamInfoBarTest, TestDismissIsNotSticky) {
   content::WebContents* tab_contents = LoadTestPageInTab();
 
   // If dismiss were sticky the second call would hang because it hangs if an
   // infobar does not pop up.
   GetUserMediaAndDismiss(tab_contents);
   GetUserMediaAndDismiss(tab_contents);
 }
 
 IN_PROC_BROWSER_TEST_F(MediaStreamInfoBarTest,
@@ skipping 42 matching lines @@
 IN_PROC_BROWSER_TEST_F(MediaStreamInfoBarTest,
                        MAYBE_DenyingCameraDoesNotCauseStickyDenyForMics) {
   content::WebContents* tab_contents = LoadTestPageInTab();
 
   // If camera blocking also blocked mics, the second call here would hang.
   GetUserMediaWithSpecificConstraintsAndDeny(tab_contents,
                                              kVideoOnlyCallConstraints);
   GetUserMediaWithSpecificConstraintsAndAccept(tab_contents,
                                                kAudioOnlyCallConstraints);
 }