Remove pointer from PermissionPromptAndroid to InfoBar

chrome/browser/permissions/permission_request_manager.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 "chrome/browser/permissions/permission_request_manager.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/feature_list.h"
@@ skipping 211 matching lines @@
       it->second->RequestFinished();
       duplicate_requests_.erase(it);
       return;
     }
   }
 
   NOTREACHED();  // Callers should not cancel requests that are not pending.
 }
 
 void PermissionRequestManager::HideBubble() {
-#if defined(ANDROID)
-  // The infobar system manages infobar lifetime and visibility so don't delete
-  // the PermissionPromptAndroid.
-  NOTREACHED();

[Timothy Loh, 2017/04/10 04:23:48]

Not sure if it's nicer to leave this here or change it to check
HidesAutomatically()?

[benwells, 2017/04/10 07:00:57]

I don't have a strong opinion :)

-#else
-  // Disengage from the existing view if there is one.
-  if (!view_)
+  // Disengage from the existing view if there is one and it doesn't manage
+  // its own visibility.
+  if (!view_ || view_->HidesAutomatically())
     return;
 
   view_->SetDelegate(nullptr);
   view_->Hide();
   view_.reset();
-#endif
 }
 
 void PermissionRequestManager::DisplayPendingRequests() {
   if (IsBubbleVisible())
     return;
 
   view_ = view_factory_.Run(web_contents());
   view_->SetDelegate(this);
 
   TriggerShowBubble();
@@ skipping 150 matching lines @@
   view_->Show(requests_, accept_states_);
   PermissionUmaUtil::PermissionPromptShown(requests_);
   NotifyBubbleAdded();
 
   // If in testing mode, automatically respond to the bubble that was shown.
   if (auto_response_for_test_ != NONE)
     DoAutoResponseForTesting();
 }
 
 void PermissionRequestManager::FinalizeBubble() {
-  if (view_)
+  if (view_ && !view_->HidesAutomatically())
     view_->Hide();
 
   std::vector<PermissionRequest*>::iterator requests_iter;
   for (requests_iter = requests_.begin();
        requests_iter != requests_.end();
        requests_iter++) {
     RequestFinishedIncludingDuplicates(*requests_iter);
   }
   requests_.clear();
   accept_states_.clear();
@@ skipping 106 matching lines @@
     case DENY_ALL:
       Deny();
       break;
     case DISMISS:
       Closing();
       break;
     case NONE:
       NOTREACHED();
   }
 }