[InfoBar] Add InfoBarDelegate::GetIconID()

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/compiler_specific.h"
 #include "base/stringprintf.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
@@ skipping 157 matching lines @@
                     content::NotificationService::AllSources());
   }
 }
 
 void GeolocationNotificationObserver::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   if (type == chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_ADDED) {
     infobar_ = content::Details<InfoBarAddedDetails>(details).ptr();
-    ASSERT_TRUE(infobar_->GetIcon());
+    ASSERT_FALSE(infobar_->GetIcon().IsEmpty());
     ASSERT_TRUE(infobar_->AsConfirmInfoBarDelegate());
   } else if (type == content::NOTIFICATION_DOM_OPERATION_RESPONSE) {
     content::Details<DomOperationNotificationDetails> dom_op_details(details);
     javascript_response_ = dom_op_details->json;
     LOG(WARNING) << "javascript_response " << javascript_response_;
   } else if (type == content::NOTIFICATION_NAV_ENTRY_COMMITTED ||
               type == content::NOTIFICATION_LOAD_START) {
     navigation_started_ = true;
   } else if (type == content::NOTIFICATION_LOAD_STOP) {
     if (navigation_started_) {
@@ skipping 545 matching lines @@
   AddGeolocationWatch(false);
 
   std::string script =
       "window.domAutomationController.send(window.close());";
   bool result =
       content::ExecuteScript(
           current_browser_->tab_strip_model()->GetActiveWebContents(),
           script);
   EXPECT_EQ(result, true);
 }