GeolocationBrowserTest: only put bubble in test mode when needed

chrome/browser/geolocation/geolocation_browsertest.cc

 // Copyright (c) 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 <string>
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
@@ skipping 163 matching lines @@
     registrar_.Add(this, chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_ADDED,
                    content::NotificationService::AllSources());
   } else if (!wait_for_prompt) {
     registrar_.Add(this, content::NOTIFICATION_NAV_ENTRY_COMMITTED,
                    content::NotificationService::AllSources());
     registrar_.Add(this, content::NOTIFICATION_LOAD_START,
                    content::NotificationService::AllSources());
     registrar_.Add(this, content::NOTIFICATION_LOAD_STOP,
                    content::NotificationService::AllSources());
   }
-  mock_view_->SetBrowserTest(true);
+  if (PermissionBubbleManager::Enabled())
+    mock_view_->SetBrowserTest(true);
 }
 
 GeolocationNotificationObserver::~GeolocationNotificationObserver() {
 }
 
 void GeolocationNotificationObserver::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   if (type == chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_ADDED) {
@@ skipping 701 matching lines @@
                 ->GetLastUsage(current_url().GetOrigin(),
                                current_url().GetOrigin(),
                                CONTENT_SETTINGS_TYPE_GEOLOCATION)
                 .ToDoubleT(),
             13);
 }
 
 INSTANTIATE_TEST_CASE_P(GeolocationBrowserTestWithParams,
                         GeolocationBrowserTest,
                         testing::Values(false));