Makes InfoBarService not close infobars on a reload from browser instant

chrome/browser/ui/browser_instant_controller.cc

 // Copyright 2012 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/ui/browser_instant_controller.h"
 
 #include "base/bind.h"
+#include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search/instant_service.h"
 #include "chrome/browser/search/instant_service_factory.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/location_bar/location_bar.h"
 #include "chrome/browser/ui/omnibox/omnibox_popup_model.h"
 #include "chrome/browser/ui/omnibox/omnibox_view.h"
 #include "chrome/browser/ui/search/instant_search_prerenderer.h"
@@ skipping 135 matching lines @@
       continue;
 
     // Send new search URLs to the renderer.
     content::RenderProcessHost* rph = contents->GetRenderProcessHost();
     instant_service->SendSearchURLsToRenderer(rph);
 
     // Reload the contents to ensure that it gets assigned to a non-priviledged
     // renderer.
     if (!instant_service->IsInstantProcess(rph->GetID()))
       continue;
+
     contents->GetController().Reload(false);

[Peter Kasting, 2014/09/18 17:48:04]

Nit: Maybe add a comment about whether the order of the Reload() and
set_ignore_next_reload() calls matters, since the order you have is opposite
what someone would probably assume is correct.

[sky, 2014/09/18 19:22:27]

Done.

+
+    InfoBarService* info_bar_service =

[Peter Kasting, 2014/09/18 17:48:05]

Nit: Consider adding a comment here about why we want to ignore the next reload.

[sky, 2014/09/18 19:22:27]

Done.

+        InfoBarService::FromWebContents(contents);

[Peter Kasting, 2014/09/18 17:48:05]

Can this actually be NULL?  If so add a comment about when.

[sky, 2014/09/18 19:22:27]

You're right, it can't. Nuked.

+    if (info_bar_service)
+      info_bar_service->set_ignore_next_reload();
   }
 }