Move blocked content from TabContents to TabContentsWrapper.

chrome/browser/ui/content_settings/content_setting_combo_model.cc

Index: chrome/browser/ui/content_settings/content_setting_combo_model.cc
diff --git a/chrome/browser/content_setting_combo_model.cc b/chrome/browser/ui/content_settings/content_setting_combo_model.cc
similarity index 95%
rename from chrome/browser/content_setting_combo_model.cc
rename to chrome/browser/ui/content_settings/content_setting_combo_model.cc
index 8519ecc86f60388400e82080b3f2b201cc1e6733..a6dd38ecc3846a37f7a5d1f6271e37ac0e14bb52 100644
--- a/chrome/browser/content_setting_combo_model.cc
+++ b/chrome/browser/ui/content_settings/content_setting_combo_model.cc
@@ -1,8 +1,8 @@
-// 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.
 
-#include "chrome/browser/content_setting_combo_model.h"
+#include "chrome/browser/ui/content_settings/content_setting_combo_model.h"
 
 #include "base/command_line.h"
 #include "base/string16.h"
@@ -76,4 +76,3 @@ int ContentSettingComboModel::IndexForSetting(ContentSetting setting) {
   NOTREACHED();
   return 0;
 }
-