[WebsiteSettings] Enable permission bubbles by default.

chrome/browser/media/webrtc_browsertest_base.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 "chrome/browser/media/webrtc_browsertest_base.h"
 
 #include "base/lazy_instance.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/media/media_stream_infobar_delegate.h"
 #include "chrome/browser/media/webrtc_browsertest_common.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
+#include "chrome/browser/ui/website_settings/permission_bubble_manager.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "components/infobars/core/infobar.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/test/browser_test_utils.h"
+#include "content/public/test/test_utils.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 
 #if defined(OS_WIN)
 // For fine-grained suppression.
 #include "base/win/windows_version.h"
 #endif
 
 const char WebRtcTestBase::kAudioVideoCallConstraints[] =
     "{audio: true, video: true}";
 const char WebRtcTestBase::kAudioVideoCallConstraintsQVGA[] =
@@ skipping 65 matching lines @@
 
 void WebRtcTestBase::GetUserMediaAndAccept(
     content::WebContents* tab_contents) const {
   GetUserMediaWithSpecificConstraintsAndAccept(tab_contents,
                                                kAudioVideoCallConstraints);
 }
 
 void WebRtcTestBase::GetUserMediaWithSpecificConstraintsAndAccept(
     content::WebContents* tab_contents,
     const std::string& constraints) const {
-  infobars::InfoBar* infobar =
-      GetUserMediaAndWaitForInfoBar(tab_contents, constraints);
-  infobar->delegate()->AsConfirmInfoBarDelegate()->Accept();
-  CloseInfoBarInTab(tab_contents, infobar);
+  if (!PermissionBubbleManager::Enabled()) {
+    infobars::InfoBar* infobar =
+        GetUserMediaAndWaitForInfoBar(tab_contents, constraints);
+    infobar->delegate()->AsConfirmInfoBarDelegate()->Accept();
+    CloseInfoBarInTab(tab_contents, infobar);
+  } else {
+    GetUserMedia(tab_contents, constraints);
+LOG(INFO) << "Accept bubble";
+    PermissionBubbleManager::FromWebContents(tab_contents)->Accept();
+    content::RunAllPendingInMessageLoop();
+  }
 
+LOG(INFO) << "Wait until called";
   // Wait for WebRTC to call the success callback.
   const char kOkGotStream[] = "ok-got-stream";
   EXPECT_TRUE(test::PollingWaitUntil("obtainGetUserMediaResult()", kOkGotStream,
                                      tab_contents));
+LOG(INFO) << "DONE!!!!!";
 }
 
 void WebRtcTestBase::GetUserMediaAndDeny(content::WebContents* tab_contents) {
   return GetUserMediaWithSpecificConstraintsAndDeny(tab_contents,
                                                     kAudioVideoCallConstraints);
 }
 
 void WebRtcTestBase::GetUserMediaWithSpecificConstraintsAndDeny(
     content::WebContents* tab_contents,
     const std::string& constraints) const {
-  infobars::InfoBar* infobar =
-      GetUserMediaAndWaitForInfoBar(tab_contents, constraints);
-  infobar->delegate()->AsConfirmInfoBarDelegate()->Cancel();
-  CloseInfoBarInTab(tab_contents, infobar);
+  if (!PermissionBubbleManager::Enabled()) {
+    infobars::InfoBar* infobar =
+        GetUserMediaAndWaitForInfoBar(tab_contents, constraints);
+    infobar->delegate()->AsConfirmInfoBarDelegate()->Cancel();
+    CloseInfoBarInTab(tab_contents, infobar);
+  } else {
+    GetUserMedia(tab_contents, constraints);
+    PermissionBubbleManager::FromWebContents(tab_contents)->Deny();
+  }
 
   // Wait for WebRTC to call the fail callback.
   EXPECT_TRUE(test::PollingWaitUntil("obtainGetUserMediaResult()",
                                      kFailedWithPermissionDeniedError,
                                      tab_contents));
 }
 
 void WebRtcTestBase::GetUserMediaAndDismiss(
     content::WebContents* tab_contents) const {
-  infobars::InfoBar* infobar =
-      GetUserMediaAndWaitForInfoBar(tab_contents, kAudioVideoCallConstraints);
-  infobar->delegate()->InfoBarDismissed();
-  CloseInfoBarInTab(tab_contents, infobar);
+  if (!PermissionBubbleManager::Enabled()) {
+    infobars::InfoBar* infobar =
+        GetUserMediaAndWaitForInfoBar(tab_contents, kAudioVideoCallConstraints);
+    infobar->delegate()->InfoBarDismissed();
+    CloseInfoBarInTab(tab_contents, infobar);
+  } else {
+    GetUserMedia(tab_contents, kAudioVideoCallConstraints);
+    PermissionBubbleManager::FromWebContents(tab_contents)->Closing();
+  }
 
   // A dismiss should be treated like a deny.
   EXPECT_TRUE(test::PollingWaitUntil("obtainGetUserMediaResult()",
                                      kFailedWithPermissionDismissedError,
                                      tab_contents));
 }
 
 void WebRtcTestBase::GetUserMedia(content::WebContents* tab_contents,
                                   const std::string& constraints) const {
   // Request user media: this will launch the media stream info bar.
@@ skipping 44 matching lines @@
 }
 
 content::WebContents* WebRtcTestBase::OpenTestPageAndGetUserMediaInNewTab(
     const std::string& test_page) const {
   return OpenPageAndGetUserMediaInNewTab(
       embedded_test_server()->GetURL(test_page));
 }
 
 content::WebContents* WebRtcTestBase::OpenPageAndAcceptUserMedia(
     const GURL& url) const {
-  content::WindowedNotificationObserver infobar_added(
+  content::WindowedNotificationObserver nav(
       chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_ADDED,
       content::NotificationService::AllSources());
 
   ui_test_utils::NavigateToURL(browser(), url);
 
-  infobar_added.Wait();
+  nav.Wait();
 
   content::WebContents* tab_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
-  content::Details<infobars::InfoBar::AddedDetails> details(
-      infobar_added.details());
-  infobars::InfoBar* infobar = details.ptr();
-  EXPECT_TRUE(infobar);
-  infobar->delegate()->AsMediaStreamInfoBarDelegate()->Accept();
+  if (!PermissionBubbleManager::Enabled()) {
+    content::Details<infobars::InfoBar::AddedDetails> details(
+        nav.details());
+    infobars::InfoBar* infobar = details.ptr();
+    EXPECT_TRUE(infobar);
+    infobar->delegate()->AsMediaStreamInfoBarDelegate()->Accept();
 
-  CloseInfoBarInTab(tab_contents, infobar);
+    CloseInfoBarInTab(tab_contents, infobar);
+  } else {
+    PermissionBubbleManager* mgr =
+        PermissionBubbleManager::FromWebContents(tab_contents);
+    mgr->Closing();
+  }
   return tab_contents;
 }
 
 void WebRtcTestBase::CloseInfoBarInTab(content::WebContents* tab_contents,
                                        infobars::InfoBar* infobar) const {
   content::WindowedNotificationObserver infobar_removed(
       chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_REMOVED,
       content::NotificationService::AllSources());
 
   InfoBarService* infobar_service =
@@ skipping 128 matching lines @@
 #endif
 }
 
 bool WebRtcTestBase::OnWin8() const {
 #if defined(OS_WIN)
   return base::win::GetVersion() > base::win::VERSION_WIN7;
 #else
   return false;
 #endif
 }