Revert 251397 "[WebsiteSettings] Fix bug in permission bubble ma..."

Revert reason: cros unit test failures

See: http://build.chromium.org/p/chromium.chromiumos/builders/Linux%20ChromiumOS%20Tests%20%281%29

Sample output:

ersiveModeControllerAshTest.TabAndBrowserFullscreen (run #3):
[ RUN      ] ImmersiveModeControllerAshTest.TabAndBrowserFullscreen
Xlib:  extension "RANDR" missing on display ":9".
[21038:21038:0214/121606:1047752665:WARNING:native_view_host_aura.cc(71)] NativeViewHostAura::InstallClip is not implemented yet.
[21038:21038:0214/121606:1047752835:WARNING:native_view_host_aura.cc(71)] NativeViewHostAura::InstallClip is not implemented yet.
[21038:21038:0214/121606:1047752914:WARNING:native_view_host_aura.cc(71)] NativeViewHostAura::InstallClip is not implemented yet.
Received signal 11 SEGV_MAPERR 00020000002d
 [0x7f0b3aa767ce] base::debug::StackTrace::StackTrace()
 [0x7f0b3aa76cf8] base::debug::(anonymous namespace)::StackDumpSignalHandler()
 [0x7f0b34340cb0] \u003Cunknown>
 [0x00000379579c] PermissionBubbleViewViews::~PermissionBubbleViewViews()
 [0x00000373aafb] BrowserView::~BrowserView()
 [0x00000373ad69] BrowserView::~BrowserView()
 [0x7f0b38da5de2] views::View::~View()
 [0x7f0b38dbbcf0] views::NonClientView::~NonClientView()
 [0x7f0b38dbbd69] views::NonClientView::~NonClientView()
 [0x7f0b38da5bed] views::View::DoRemoveChildView()
 [0x7f0b38da5ce5] views::View::RemoveAllChildViews()
 [0x7f0b38da9dd8] views::internal::RootView::~RootView()
 [0x000003734aa0] BrowserRootView::~BrowserRootView()


> [WebsiteSettings] Fix bug in permission bubble manager to alter showing state when bubble is closed.
> 
> This bug meant that subsequent calls to AddRequest wouldn't show the bubble, since the manager still believed it was being shown.
> 
> R=leng@chromium.org
> 
> Review URL: https://codereview.chromium.org/162423002

TBR=gbillock@chromium.org

Review URL: https://codereview.chromium.org/167533003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@251414 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/ui/website_settings/permission_bubble_manager.cc

@@ -162,15 +162,17 @@ void PermissionBubbleManager::Closing() {
 
 void PermissionBubbleManager::ShowBubble() {
   if (view_ && !bubble_showing_ && requests_.size()) {
+    view_->SetDelegate(this);
     view_->Show(requests_, accept_states_, customization_mode_);
     bubble_showing_ = true;
   }
 }
 
 void PermissionBubbleManager::FinalizeBubble() {
-  if (view_)
+  if (view_) {
+    view_->SetDelegate(NULL);
     view_->Hide();
-  bubble_showing_ = false;
+  }
 
   std::vector<PermissionBubbleRequest*>::iterator requests_iter;
   for (requests_iter = requests_.begin();
@@ -180,6 +182,7 @@ void PermissionBubbleManager::FinalizeBubble() {
   }
   requests_.clear();
   accept_states_.clear();
+  bubble_showing_ = false;
   if (queued_requests_.size()) {
     requests_ = queued_requests_;
     accept_states_.resize(requests_.size(), true);

chrome/browser/ui/website_settings/permission_bubble_manager_unittest.cc

@@ -283,22 +283,3 @@ TEST_F(PermissionBubbleManagerTest, TestAddDuplicateRequest) {
   EXPECT_EQ(&request1_, view_.permission_requests_[0]);
   EXPECT_EQ(&request2_, view_.permission_requests_[1]);
 }
-
-TEST_F(PermissionBubbleManagerTest, SequentialRequests) {
-  manager_->SetView(&view_);
-  manager_->AddRequest(&request1_);
-  WaitForCoalescing();
-  EXPECT_TRUE(view_.shown_);
-
-  Accept();
-  EXPECT_TRUE(request1_.granted_);
-
-  EXPECT_FALSE(view_.shown_);
-
-  manager_->AddRequest(&request2_);
-  WaitForCoalescing();
-  EXPECT_TRUE(view_.shown_);
-  Accept();
-  EXPECT_FALSE(view_.shown_);
-  EXPECT_TRUE(request2_.granted_);
-}