Handles iframe permissions requests separately, in a subsequent bubble.

chrome/browser/ui/website_settings/permission_bubble_manager_unittest.cc

 // Copyright 2014 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/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/website_settings/mock_permission_bubble_request.h"
 #include "chrome/browser/ui/website_settings/permission_bubble_manager.h"
 #include "chrome/browser/ui/website_settings/permission_bubble_request.h"
@@ skipping 46 matching lines @@
   std::vector<bool> permission_states_;
 };
 
 }  // namespace
 
 class PermissionBubbleManagerTest : public ChromeRenderViewHostTestHarness {
  public:
   PermissionBubbleManagerTest()
       : ChromeRenderViewHostTestHarness(),
         request1_("test1"),
-        request2_("test2") {}
+        request2_("test2"),
+        iframe_request_("iframe", GURL("http://www.youtube.com")) {}
   virtual ~PermissionBubbleManagerTest() {}
 
   virtual void SetUp() OVERRIDE {
     ChromeRenderViewHostTestHarness::SetUp();
     SetContents(CreateTestWebContents());
+    NavigateAndCommit(GURL("http://www.google.com"));
 
     manager_.reset(new PermissionBubbleManager(web_contents()));
   }
 
   virtual void TearDown() OVERRIDE {
     manager_.reset();
     ChromeRenderViewHostTestHarness::TearDown();
   }
 
   void ToggleAccept(int index, bool value) {
     manager_->ToggleAccept(index, value);
   }
 
   void Accept() {
     manager_->Accept();
   }
 
   void Closing() {
     manager_->Closing();
   }
 
+  void WaitForFrameLoad() {
+    manager_->DocumentLoadedInFrame(0, NULL);
+    base::MessageLoop::current()->RunUntilIdle();
+  }
+
   void WaitForCoalescing() {
     manager_->DocumentOnLoadCompletedInMainFrame();
     base::MessageLoop::current()->RunUntilIdle();
   }
 
   virtual void NavigationEntryCommitted(
       const content::LoadCommittedDetails& details) {
     manager_->NavigationEntryCommitted(details);
   }
 
  protected:
   MockPermissionBubbleRequest request1_;
   MockPermissionBubbleRequest request2_;
+  MockPermissionBubbleRequest iframe_request_;
   MockView view_;
   scoped_ptr<PermissionBubbleManager> manager_;
 };
 
 TEST_F(PermissionBubbleManagerTest, TestFlag) {
   EXPECT_FALSE(PermissionBubbleManager::Enabled());
   CommandLine::ForCurrentProcess()->AppendSwitch(
       switches::kEnablePermissionsBubbles);
   EXPECT_TRUE(PermissionBubbleManager::Enabled());
 }
@@ skipping 197 matching lines @@
   EXPECT_TRUE(dupe_request.finished());
   EXPECT_FALSE(request1_.finished());
 
   MockPermissionBubbleRequest dupe_request2("test1");
   manager_->AddRequest(&dupe_request2);
   EXPECT_TRUE(dupe_request2.finished());
   EXPECT_FALSE(request2_.finished());
 }
 
 TEST_F(PermissionBubbleManagerTest, ForgetRequestsOnPageNavigation) {
-  NavigateAndCommit(GURL("http://www.google.com/"));
   manager_->SetView(&view_);
   manager_->AddRequest(&request1_);
   WaitForCoalescing();
   manager_->AddRequest(&request2_);
 
   EXPECT_TRUE(view_.shown_);
   ASSERT_EQ(1u, view_.permission_requests_.size());
 
   NavigateAndCommit(GURL("http://www2.google.com/"));
   WaitForCoalescing();
@@ skipping 49 matching lines @@
 
   EXPECT_TRUE(view_.shown_);
   EXPECT_EQ(1u, view_.permission_requests_.size());
   manager_->CancelRequest(&request2_);
 
   EXPECT_TRUE(view_.shown_);
   EXPECT_FALSE(request1_.finished());
   EXPECT_TRUE(request2_.finished());
 }
 
+TEST_F(PermissionBubbleManagerTest, MainFrameNoRequestIFrameRequest) {
+  manager_->SetView(&view_);
+  manager_->AddRequest(&iframe_request_);
+  WaitForCoalescing();
+  WaitForFrameLoad();
+
+  EXPECT_TRUE(view_.shown_);
+}
+
+TEST_F(PermissionBubbleManagerTest, MainFrameAndIFrameRequests) {
+  manager_->SetView(&view_);
+  manager_->AddRequest(&request1_);
+  manager_->AddRequest(&iframe_request_);
+  WaitForFrameLoad();
+  WaitForCoalescing();

[Greg Billock, 2014/05/21 17:09:19]

Maybe try a request with a url like www.google.com/some/url

Also, should this be checking that view_.shown_ iwth request1_, and then after
closing that, that iframe_request_ is shown?

[leng, 2014/05/22 00:08:47]

I assumed you meant the url to be the iframe url...  done.

I also fleshed out the tests some more.  For some reason, I stopped partway.

+}