Do not show most startup infobars in browser tests.

Prevent startup infobars (e.g. when running with --no-sandbox) from interfering with tests which assume no pre-existing infobars.

BUG=315059
R=pkasting@chromium.org

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

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

chrome/browser/ui/startup/startup_browser_creator_impl.cc

@@ -897,13 +897,11 @@ void StartupBrowserCreatorImpl::AddInfoBarsIfNecessary(
   // The below info bars are only added to the first profile which is launched.
   // Other profiles might be restoring the browsing sessions asynchronously,
   // so we cannot add the info bars to the focused tabs here.
-  if (is_process_startup == chrome::startup::IS_PROCESS_STARTUP) {
+  if (is_process_startup == chrome::startup::IS_PROCESS_STARTUP &&
+      !command_line_.HasSwitch(switches::kTestType)) {
     chrome::ShowBadFlagsPrompt(browser);
-    if (!command_line_.HasSwitch(switches::kTestType)) {
-      GoogleApiKeysInfoBarDelegate::Create(InfoBarService::FromWebContents(
-          browser->tab_strip_model()->GetActiveWebContents()));
-    }
-
+    GoogleApiKeysInfoBarDelegate::Create(InfoBarService::FromWebContents(
+        browser->tab_strip_model()->GetActiveWebContents()));
     ObsoleteOSInfoBarDelegate::Create(InfoBarService::FromWebContents(
         browser->tab_strip_model()->GetActiveWebContents()));