Move blocked content from TabContents to TabContentsWrapper.

chrome/browser/ui/content_settings/content_setting_combo_model.h

Index: chrome/browser/ui/content_settings/content_setting_combo_model.h
diff --git a/chrome/browser/content_setting_combo_model.h b/chrome/browser/ui/content_settings/content_setting_combo_model.h
similarity index 71%
rename from chrome/browser/content_setting_combo_model.h
rename to chrome/browser/ui/content_settings/content_setting_combo_model.h
index 274285f7bbd0b8073b4859655e5c6405d5b89d40..2502188132621bc20c2408c8e46adc1efba1fb2a 100644
--- a/chrome/browser/content_setting_combo_model.h
+++ b/chrome/browser/ui/content_settings/content_setting_combo_model.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
-#ifndef CHROME_BROWSER_CONTENT_SETTING_COMBO_MODEL_H_
-#define CHROME_BROWSER_CONTENT_SETTING_COMBO_MODEL_H_
+#ifndef CHROME_BROWSER_UI_CONTENT_SETTINGS_CONTENT_SETTING_COMBO_MODEL_H_
+#define CHROME_BROWSER_UI_CONTENT_SETTINGS_CONTENT_SETTING_COMBO_MODEL_H_
 #pragma once
 
 #include "base/basictypes.h"
@@ -29,4 +29,4 @@ class ContentSettingComboModel : public ui::ComboboxModel {
   DISALLOW_COPY_AND_ASSIGN(ContentSettingComboModel);
 };
 
-#endif  // CHROME_BROWSER_CONTENT_SETTING_COMBO_MODEL_H_
+#endif  // CHROME_BROWSER_UI_CONTENT_SETTINGS_CONTENT_SETTING_COMBO_MODEL_H_