7 files changed, 10 insertions, 12 deletions
diff --git a/chrome/browser/blocked_popup_container_unittest.cc b/chrome/browser/blocked_popup_container_unittest.cc
index f31a1cb..cedf1c8 100644
--- a/chrome/browser/blocked_popup_container_unittest.cc
+++ b/chrome/browser/blocked_popup_container_unittest.cc
@@ -13,7 +13,7 @@
 #include "app/app_paths.h"
 #include "base/path_service.h"
 #include "chrome/browser/blocked_popup_container.h"
-#include "chrome/browser/tab_contents/test_web_contents.h"
+#include "chrome/browser/tab_contents/test_tab_contents.h"
 #include "chrome/browser/renderer_host/test/test_render_view_host.h"
 #include "chrome/test/testing_profile.h"
 #include "net/base/net_util.h"
diff --git a/chrome/browser/renderer_host/test/test_render_view_host.cc b/chrome/browser/renderer_host/test/test_render_view_host.cc
index 3fb5f67..49ac1d4 100644
--- a/chrome/browser/renderer_host/test/test_render_view_host.cc
+++ b/chrome/browser/renderer_host/test/test_render_view_host.cc
@@ -6,7 +6,7 @@
 
 #include "base/gfx/rect.h"
 #include "chrome/browser/renderer_host/backing_store.h"
-#include "chrome/browser/tab_contents/test_web_contents.h"
+#include "chrome/browser/tab_contents/test_tab_contents.h"
 #include "chrome/common/render_messages.h"
 
 using webkit_glue::PasswordForm;
diff --git a/chrome/browser/renderer_host/test/test_render_view_host.h b/chrome/browser/renderer_host/test/test_render_view_host.h
index 18a6db7..5f1f0b8 100644
--- a/chrome/browser/renderer_host/test/test_render_view_host.h
+++ b/chrome/browser/renderer_host/test/test_render_view_host.h
@@ -13,7 +13,7 @@
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/renderer_host/render_view_host_factory.h"
 #include "chrome/browser/renderer_host/site_instance.h"
-#include "chrome/browser/tab_contents/test_web_contents.h"
+#include "chrome/browser/tab_contents/test_tab_contents.h"
 #include "chrome/test/testing_profile.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -23,8 +23,6 @@
 #include "chrome/common/temp_scaffolding_stubs.h"
 #endif
 
-class TestTabContents;
-
 // This file provides a testing framework for mocking out the RenderProcessHost
 // layer. It allows you to test RenderViewHost, TabContents,
 // NavigationController, and other layers above that without running an actual
diff --git a/chrome/browser/tab_contents/test_web_contents.cc b/chrome/browser/tab_contents/test_tab_contents.cc
index f27aa9b..97643f3 100644
--- a/chrome/browser/tab_contents/test_web_contents.cc
+++ b/chrome/browser/tab_contents/test_tab_contents.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/tab_contents/test_web_contents.h"
+#include "chrome/browser/tab_contents/test_tab_contents.h"
 
 #include "chrome/browser/renderer_host/test/test_render_view_host.h"
 
diff --git a/chrome/browser/tab_contents/test_web_contents.h b/chrome/browser/tab_contents/test_tab_contents.h
index ea572a1..ff9c6b7 100644
--- a/chrome/browser/tab_contents/test_web_contents.h
+++ b/chrome/browser/tab_contents/test_tab_contents.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_TAB_CONTENTS_TEST_tab_contents_H_
-#define CHROME_BROWSER_TAB_CONTENTS_TEST_tab_contents_H_
+#ifndef CHROME_BROWSER_TAB_CONTENTS_TEST_TAB_CONTENTS_H_
+#define CHROME_BROWSER_TAB_CONTENTS_TEST_TAB_CONTENTS_H_
 
 #include "chrome/browser/tab_contents/tab_contents.h"
 
@@ -51,4 +51,4 @@ class TestTabContents : public TabContents {
   bool transition_cross_site;
 };
 
-#endif  // CHROME_BROWSER_TAB_CONTENTS_TEST_tab_contents_H_
+#endif  // CHROME_BROWSER_TAB_CONTENTS_TEST_TAB_CONTENTS_H_
diff --git a/chrome/browser/tab_contents/web_contents_unittest.cc b/chrome/browser/tab_contents/web_contents_unittest.cc
index 987eb9f..f7d021b 100644
--- a/chrome/browser/tab_contents/web_contents_unittest.cc
+++ b/chrome/browser/tab_contents/web_contents_unittest.cc
@@ -10,7 +10,7 @@
 #include "chrome/browser/tab_contents/interstitial_page.h"
 #include "chrome/browser/tab_contents/navigation_controller.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
-#include "chrome/browser/tab_contents/test_web_contents.h"
+#include "chrome/browser/tab_contents/test_tab_contents.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/pref_service.h"
 #include "chrome/common/render_messages.h"
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index a5a02fe..354dd05 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -3646,8 +3646,8 @@
         'browser/renderer_host/mock_render_process_host.h',
         'browser/renderer_host/test/test_render_view_host.cc',
         'browser/renderer_host/test/test_render_view_host.h',
-        'browser/tab_contents/test_web_contents.cc',
-        'browser/tab_contents/test_web_contents.h',
+        'browser/tab_contents/test_tab_contents.cc',
+        'browser/tab_contents/test_tab_contents.h',
         'common/ipc_test_sink.cc',
         'common/ipc_test_sink.h',
         'renderer/mock_keyboard.cc',