6 files changed, 11 insertions, 18 deletions
diff --git a/chrome/browser/browser.scons b/chrome/browser/browser.scons
index c200bb3..b767cd8 100644
--- a/chrome/browser/browser.scons
+++ b/chrome/browser/browser.scons
@@ -170,9 +170,6 @@ input_files = ChromeFileList([
     'bookmarks/bookmark_utils.cc',
     'bookmarks/bookmark_utils.h',
   ]),
-  MSVSFilter('Tab Contents (Old)', [
-    'security_style.h',
-  ]),
   MSVSFilter('Browser Window', [
     'app_modal_dialog_queue.cc',
     'app_modal_dialog_queue.h',
@@ -577,6 +574,7 @@ input_files = ChromeFileList([
     'tab_contents/render_view_context_menu_controller.h',
     'tab_contents/render_view_host_manager.cc',
     'tab_contents/render_view_host_manager.h',
+    'tab_contents/security_style.h',
     'tab_contents/site_instance.cc',
     'tab_contents/site_instance.h',
     'tab_contents/status_view.cc',
diff --git a/chrome/browser/browser.vcproj b/chrome/browser/browser.vcproj
index 48c6629..6995730 100644
--- a/chrome/browser/browser.vcproj
+++ b/chrome/browser/browser.vcproj
@@ -651,14 +651,6 @@
 			</File>
 		</Filter>
 		<Filter
-			Name="Tab Contents (Old)"
-			>
-			<File
-				RelativePath=".\security_style.h"
-				>
-			</File>
-		</Filter>
-		<Filter
 			Name="Browser Window"
 			>
 			<File
@@ -2186,6 +2178,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\tab_contents\security_style.h"
+				>
+			</File>
+			<File
 				RelativePath=".\tab_contents\site_instance.cc"
 				>
 			</File>
diff --git a/chrome/browser/ssl/ssl_manager.h b/chrome/browser/ssl/ssl_manager.h
index e650b35..a58f3fe 100644
--- a/chrome/browser/ssl/ssl_manager.h
+++ b/chrome/browser/ssl/ssl_manager.h
@@ -12,8 +12,8 @@
 #include "base/observer_list.h"
 #include "base/ref_counted.h"
 #include "chrome/browser/renderer_host/resource_dispatcher_host.h"
-#include "chrome/browser/security_style.h"
 #include "chrome/browser/tab_contents/provisional_load_details.h"
+#include "chrome/browser/tab_contents/security_style.h"
 #include "chrome/common/notification_registrar.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/render_messages.h"
diff --git a/chrome/browser/tab_contents/navigation_entry.h b/chrome/browser/tab_contents/navigation_entry.h
index 7e6b1f3..8c2c89c 100644
--- a/chrome/browser/tab_contents/navigation_entry.h
+++ b/chrome/browser/tab_contents/navigation_entry.h
@@ -9,7 +9,7 @@
 #include "base/scoped_ptr.h"
 #include "base/string_util.h"
 #include "chrome/app/theme/theme_resources.h"
-#include "chrome/browser/security_style.h"
+#include "chrome/browser/tab_contents/security_style.h"
 #include "chrome/browser/tab_contents/site_instance.h"
 #include "chrome/browser/tab_contents/tab_contents_type.h"
 #include "chrome/common/page_transition_types.h"
diff --git a/chrome/browser/security_style.h b/chrome/browser/tab_contents/security_style.h
index fb04bf3..355401c 100644
--- a/chrome/browser/security_style.h
+++ b/chrome/browser/tab_contents/security_style.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_SECURITY_STYLE_H__
-#define CHROME_BROWSER_SECURITY_STYLE_H__
+#ifndef CHROME_BROWSER_TAB_CONTENTS_SECURITY_STYLE_H_
+#define CHROME_BROWSER_TAB_CONTENTS_SECURITY_STYLE_H_
 
 // Various aspects of the UI change their appearance according to the security
 // context in which they are displayed.  For example, the location bar displays
@@ -31,5 +31,4 @@ enum SecurityStyle {
   SECURITY_STYLE_AUTHENTICATED,
 };
 
-#endif // CHROME_BROWSER_SECURITY_STYLE_H__
-
+#endif  // CHROME_BROWSER_TAB_CONTENTS_SECURITY_STYLE_H_
diff --git a/chrome/test/automation/tab_proxy.h b/chrome/test/automation/tab_proxy.h
index 64e04de..508de11 100644
--- a/chrome/test/automation/tab_proxy.h
+++ b/chrome/test/automation/tab_proxy.h
@@ -10,8 +10,8 @@
 #include <vector>
 
 #include "chrome/browser/download/save_package.h"
-#include "chrome/browser/security_style.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
+#include "chrome/browser/tab_contents/security_style.h"
 #include "chrome/test/automation/automation_handle_tracker.h"
 
 class ConstrainedWindowProxy;