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 e56e40e6826eedff12a0f8e8f991b6c98e426586..46fc326b592adbe679b0f8a84b0c3394231cb2bc 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
@@ -6,7 +6,6 @@
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
-#include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h"
 #include "chrome/browser/ui/content_settings/content_setting_image_model.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
@@ -179,10 +178,10 @@ void ContentSettingImageView::OnMouseReleased(const views::MouseEvent& event) {
     pause_animation_ = true;
   }
 
-  Profile* profile = parent_->browser()->profile();
+  Profile* profile = parent_->profile();
   ContentSettingBubbleContents* bubble = new ContentSettingBubbleContents(
       ContentSettingBubbleModel::CreateContentSettingBubbleModel(
-          parent_->browser(),
+          parent_->delegate()->GetContentSettingBubbleModelDelegate(),
           tab_contents,
           profile,
           content_setting_image_model_->get_content_settings_type()),
@@ -190,7 +189,7 @@ void ContentSettingImageView::OnMouseReleased(const views::MouseEvent& event) {
       tab_contents->web_contents(),
       this,
       views::BubbleBorder::TOP_RIGHT);
-  bubble_widget_ = browser::CreateViewsBubble(bubble);
+  bubble_widget_ = parent_->delegate()->CreateViewsBubble(bubble);
   bubble_widget_->AddObserver(this);
   bubble->Show();
 }