Re-factor location bar/toolbar code to get rid of the browser dependency.

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 0f63d04b61896df798b631a9b1f2bf7ac1290a3a..4de3f74e22c9e14fdd8a5477b773b1fbb48b0336 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
@@ -13,6 +13,7 @@
 #include "chrome/browser/ui/views/content_setting_bubble_contents.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "chrome/browser/ui/views/window.h"
+#include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/web_contents.h"
 #include "third_party/skia/include/core/SkShader.h"
 #include "ui/base/animation/slide_animation.h"
@@ -24,6 +25,7 @@
 #include "ui/gfx/skia_util.h"
 #include "ui/views/border.h"
 
+using content::NavigationController;
 using content::WebContents;
 
 namespace {
@@ -164,10 +166,14 @@ void ContentSettingImageView::OnMouseReleased(const views::MouseEvent& event) {
   if (!tab_contents)
     return;
 
-  Profile* profile = parent_->browser()->profile();
+  Browser* browser = parent_->FindBrowser();
+  if (!browser)
+    return;
+
+  Profile* profile = browser->profile();
   ContentSettingBubbleContents* bubble = new ContentSettingBubbleContents(
       ContentSettingBubbleModel::CreateContentSettingBubbleModel(
-          parent_->browser(),
+          browser,
           tab_contents,
           profile,
           content_setting_image_model_->get_content_settings_type()),