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

chrome/browser/ui/content_settings/content_setting_bubble_model.h

Index: chrome/browser/ui/content_settings/content_setting_bubble_model.h
diff --git a/chrome/browser/ui/content_settings/content_setting_bubble_model.h b/chrome/browser/ui/content_settings/content_setting_bubble_model.h
index eabc97b4bdbcd2f1a44b422e92947418f7a61054..e4858a3f9d59b3b1b2b3da655cfd30750c2c5078 100644
--- a/chrome/browser/ui/content_settings/content_setting_bubble_model.h
+++ b/chrome/browser/ui/content_settings/content_setting_bubble_model.h
@@ -17,7 +17,7 @@
 #include "googleurl/src/gurl.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
-class Browser;
+class BrowserShowContentRelated;
 class Profile;
 class TabContentsWrapper;
 
@@ -27,8 +27,10 @@ class ContentSettingBubbleModel : public content::NotificationObserver {
  public:
   virtual ~ContentSettingBubbleModel();
 
+  typedef BrowserShowContentRelated Delegate;

[sky, 2012/02/29 22:41:10]

Can we name this class ContentSettingsBubbleModelDelegate?

[altimofeev, 2012/03/01 10:05:39]

Which one, Delegate or BrowserShowContentRelated?

IMO BrowserShowContentRelated is more general and could be reused by some other
class, not directly related to ContentSettingBubbleModel. Furthermore, it allows
easily switch from "typedef" to inheritance (Delegate : public
BrowserShowContentRelated) if any non-browser functionality will be needed from
the Delegate.

[sky, 2012/03/01 16:34:47]

Indeed, but focus on the task at hand and not worry about what *might* be needed
at some later date. If we need the flexibility later on, we can add it then.

[altimofeev, 2012/03/01 18:01:07]

Done.

+
   static ContentSettingBubbleModel* CreateContentSettingBubbleModel(
-      Browser* browser,
+      Delegate* delegate,
       TabContentsWrapper* tab_contents,
       Profile* profile,
       ContentSettingsType content_type);