Fix tooltip text for ContentSettingImageView.

chrome/browser/ui/views/location_bar/content_setting_image_view.cc

Index: chrome/browser/ui/views/location_bar/content_setting_image_view.cc
diff --git a/chrome/browser/ui/views/location_bar/content_setting_image_view.cc b/chrome/browser/ui/views/location_bar/content_setting_image_view.cc
index f15561607c140e89d0a707a63aba139c0e8c7231..1456e44979256e2f907497d860844ad9542b7094 100644
--- a/chrome/browser/ui/views/location_bar/content_setting_image_view.cc
+++ b/chrome/browser/ui/views/location_bar/content_setting_image_view.cc
@@ -147,6 +147,12 @@ void ContentSettingImageView::OnGestureEvent(ui::GestureEvent* event) {
     event->SetHandled();
 }
 
+bool ContentSettingImageView::GetTooltipText(const gfx::Point& p,
+                      base::string16* tooltip) const {
+  tooltip->assign(content_setting_image_model_->get_tooltip());

[Peter Kasting, 2016/09/08 21:51:50]

Nit: Or just

  *tooltip = content_setting_image_model_->get_tooltip();

[Evan Stade, 2016/09/09 18:48:01]

Done.

+  return !tooltip->empty();
+}
+
 void ContentSettingImageView::OnNativeThemeChanged(
     const ui::NativeTheme* native_theme) {
   if (ui::MaterialDesignController::IsModeMaterial())
@@ -286,5 +292,4 @@ void ContentSettingImageView::OnWidgetVisibilityChanged(views::Widget* widget,
 
 void ContentSettingImageView::UpdateImage() {
   SetImage(content_setting_image_model_->GetIcon(GetTextColor()).AsImageSkia());
-  image()->SetTooltipText(content_setting_image_model_->get_tooltip());
 }