Update infobars to use VectorIcon struct instead of VectorIconId.

chrome/browser/pepper_broker_infobar_delegate.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 "chrome/browser/pepper_broker_infobar_delegate.h"
 
+#include "chrome/app/vector_icons/vector_icons.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/plugins/plugin_finder.h"
 #include "chrome/browser/plugins/plugin_metadata.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "components/infobars/core/infobar.h"
 #include "components/strings/grit/components_strings.h"
 #include "components/url_formatter/elide_url.h"
 #include "content/public/browser/page_navigator.h"
 #include "content/public/browser/plugin_service.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/referrer.h"
 #include "content/public/common/webplugininfo.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/gfx/vector_icons_public.h"
 
 // static
 void PepperBrokerInfoBarDelegate::Create(
     content::WebContents* web_contents,
     const GURL& url,
     const base::FilePath& plugin_path,
     const base::Callback<void(bool)>& callback) {
   Profile* profile =
       Profile::FromBrowserContext(web_contents->GetBrowserContext());
   // TODO(wad): Add ephemeral device ID support for broker in guest mode.
@@ skipping 49 matching lines @@
 PepperBrokerInfoBarDelegate::~PepperBrokerInfoBarDelegate() {
   if (!callback_.is_null())
     callback_.Run(false);
 }
 
 infobars::InfoBarDelegate::InfoBarIdentifier
 PepperBrokerInfoBarDelegate::GetIdentifier() const {
   return PEPPER_BROKER_INFOBAR_DELEGATE;
 }
 
-gfx::VectorIconId PepperBrokerInfoBarDelegate::GetVectorIconId() const {
-  return gfx::VectorIconId::EXTENSION;
+const gfx::VectorIcon& PepperBrokerInfoBarDelegate::GetVectorIcon() const {
+  return kExtensionIcon;
 }
 
 base::string16 PepperBrokerInfoBarDelegate::GetMessageText() const {
   content::PluginService* plugin_service =
       content::PluginService::GetInstance();
   content::WebPluginInfo plugin;
   bool success = plugin_service->GetPluginInfoByPath(plugin_path_, &plugin);
   DCHECK(success);
   std::unique_ptr<PluginMetadata> plugin_metadata(
       PluginFinder::GetInstance()->GetPluginMetadata(plugin));
@@ skipping 30 matching lines @@
   content::RecordAction(result ?
       base::UserMetricsAction("PPAPI.BrokerInfobarClickedAllow") :
       base::UserMetricsAction("PPAPI.BrokerInfobarClickedDeny"));
   callback_.Run(result);
   callback_ = base::Callback<void(bool)>();
   content_settings_->SetContentSettingDefaultScope(
       url_, GURL(), CONTENT_SETTINGS_TYPE_PPAPI_BROKER, std::string(),
       result ? CONTENT_SETTING_ALLOW : CONTENT_SETTING_BLOCK);
   tab_content_settings_->SetPepperBrokerAllowed(result);
 }