Add an infobar if a session is being controlled by an automated test.

chrome/browser/devtools/global_confirm_info_bar.cc

 // Copyright 2015 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/devtools/global_confirm_info_bar.h"
 
 #include <utility>
 
 #include "base/macros.h"
 #include "base/stl_util.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "components/infobars/core/infobar.h"
 #include "ui/gfx/image/image.h"
+#include "ui/gfx/vector_icons_public.h"
 
 // InfoBarDelegateProxy -------------------------------------------------------
 
 class GlobalConfirmInfoBar::DelegateProxy : public ConfirmInfoBarDelegate {
  public:
   explicit DelegateProxy(base::WeakPtr<GlobalConfirmInfoBar> global_info_bar);
   ~DelegateProxy() override;
   void Detach();
 
  private:
   friend class GlobalConfirmInfoBar;
 
   // ConfirmInfoBarDelegate overrides
   infobars::InfoBarDelegate::InfoBarIdentifier GetIdentifier() const override;
   base::string16 GetMessageText() const override;
   int GetButtons() const override;
   base::string16 GetButtonLabel(InfoBarButton button) const override;
   bool Accept() override;
   bool Cancel() override;
   base::string16 GetLinkText() const override;
   GURL GetLinkURL() const override;
   bool LinkClicked(WindowOpenDisposition disposition) override;
   bool EqualsDelegate(infobars::InfoBarDelegate* delegate) const override;
   void InfoBarDismissed() override;
+  infobars::InfoBarDelegate::Type GetInfoBarType() const override;
+  gfx::VectorIconId GetVectorIconId() const override;

[Peter Kasting, 2017/02/08 08:23:44]

Nit: These last two go just above and just below GetIdentifier() in the above
list, respectively (to match base class declaration order)

+
+  void set_infobar(infobars::InfoBar* info_bar) {
+    info_bar_ = info_bar;
+    if (global_info_bar_)
+      global_info_bar_->delegate_->set_infobar(info_bar_);

[Peter Kasting, 2017/02/08 08:23:44]

I'm worried about this.

It seems like |global_info_bar_|'s delegate's infobar should be
|global_info_bar_|, not the provided infobar.  You said you needed to "fix a
crash".  Can you provide more info about how this is crashing, what the stack
looks like, etc.?

I'm especially worried about leaking infobars by doing the wrong thing here, as
well as having the delegate pointed at the most-recently-added view when in fact
a user may be clicking on an infobar in a different tab, and having that cause
visibility/ownership problems or something.

+  }
 
   infobars::InfoBar* info_bar_;
   base::WeakPtr<GlobalConfirmInfoBar> global_info_bar_;
 
   DISALLOW_COPY_AND_ASSIGN(DelegateProxy);
 };
 
 GlobalConfirmInfoBar::DelegateProxy::DelegateProxy(
     base::WeakPtr<GlobalConfirmInfoBar> global_info_bar)
     : info_bar_(nullptr),
@@ skipping 68 matching lines @@
 
 void GlobalConfirmInfoBar::DelegateProxy::InfoBarDismissed() {
   base::WeakPtr<GlobalConfirmInfoBar> info_bar = global_info_bar_;
   if (info_bar)
     info_bar->delegate_->InfoBarDismissed();
   // Could be destroyed after this point.
   if (info_bar)
       info_bar->Close();
 }
 
+infobars::InfoBarDelegate::Type
+GlobalConfirmInfoBar::DelegateProxy::GetInfoBarType() const {
+  return global_info_bar_ ? global_info_bar_->delegate_->GetInfoBarType()
+                          : WARNING_TYPE;

[Peter Kasting, 2017/02/08 08:23:44]

Nit: Don't hardcode the fallback type; use
ConfirmInfoBarDelegate::GetInfoBarType() instead

+}
+
+gfx::VectorIconId GlobalConfirmInfoBar::DelegateProxy::GetVectorIconId() const {
+  return global_info_bar_ ? global_info_bar_->delegate_->GetVectorIconId()
+                          : gfx::VectorIconId::VECTOR_ICON_NONE;

[Peter Kasting, 2017/02/08 08:23:44]

Nit: Same comment

+}
+
 void GlobalConfirmInfoBar::DelegateProxy::Detach() {
   global_info_bar_.reset();
 }
 
 // GlobalConfirmInfoBar -------------------------------------------------------
 
 // static
 base::WeakPtr<GlobalConfirmInfoBar> GlobalConfirmInfoBar::Show(
     std::unique_ptr<ConfirmInfoBarDelegate> delegate) {
   GlobalConfirmInfoBar* info_bar =
@@ skipping 61 matching lines @@
   DCHECK(infobar_service);
   if (ContainsKey(proxies_, infobar_service))
     return;
 
   std::unique_ptr<GlobalConfirmInfoBar::DelegateProxy> proxy(
       new GlobalConfirmInfoBar::DelegateProxy(weak_factory_.GetWeakPtr()));
   GlobalConfirmInfoBar::DelegateProxy* proxy_ptr = proxy.get();
   infobars::InfoBar* added_bar = infobar_service->AddInfoBar(
       infobar_service->CreateConfirmInfoBar(std::move(proxy)));
 
-  proxy_ptr->info_bar_ = added_bar;
+  proxy_ptr->set_infobar(added_bar);
   DCHECK(added_bar);

[Peter Kasting, 2017/02/08 08:23:44]

This DCHECK is unsafe; we can't guarantee |added_bar| is non-null.

This should be converted to a conditional return and moved to just below the
AddInfoBar() call.

   proxies_[infobar_service] = proxy_ptr;
   infobar_service->AddObserver(this);
 }