Move render_view_host_manager* and site_instance* from tab_contents to renderer_host.

Review URL: http://codereview.chromium.org/150011

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19481 0039d316-1c4b-4281-b951-d872f2087c98

21 files changed, 33 insertions, 33 deletions

diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc
index 445249f..e782a6c 100644
--- a/chrome/browser/browser.cc
+++ b/chrome/browser/browser.cc
@@ -30,6 +30,7 @@
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/options_window.h"
 #include "chrome/browser/profile.h"
+#include "chrome/browser/renderer_host/site_instance.h"
 #include "chrome/browser/sessions/session_service.h"
 #include "chrome/browser/sessions/session_types.h"
 #include "chrome/browser/sessions/tab_restore_service.h"
@@ -37,7 +38,6 @@
 #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/site_instance.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tab_contents/tab_contents_view.h"
 #include "chrome/browser/window_sizer.h"
diff --git a/chrome/browser/browsing_instance.cc b/chrome/browser/browsing_instance.cc
index 2acb412..ea23646 100644
--- a/chrome/browser/browsing_instance.cc
+++ b/chrome/browser/browsing_instance.cc
@@ -6,7 +6,7 @@
 
 #include "base/command_line.h"
 #include "chrome/browser/profile.h"
-#include "chrome/browser/tab_contents/site_instance.h"
+#include "chrome/browser/renderer_host/site_instance.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/url_constants.h"
 
diff --git a/chrome/browser/debugger/devtools_manager.cc b/chrome/browser/debugger/devtools_manager.cc
index f6dcc7b..40dfbb8 100644
--- a/chrome/browser/debugger/devtools_manager.cc
+++ b/chrome/browser/debugger/devtools_manager.cc
@@ -10,7 +10,7 @@
 #include "chrome/browser/debugger/devtools_client_host.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
-#include "chrome/browser/tab_contents/site_instance.h"
+#include "chrome/browser/renderer_host/site_instance.h"
 #include "chrome/common/devtools_messages.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
diff --git a/chrome/browser/extensions/extension_browsertest.cc b/chrome/browser/extensions/extension_browsertest.cc
index 291dfc1..74a9fb5 100644
--- a/chrome/browser/extensions/extension_browsertest.cc
+++ b/chrome/browser/extensions/extension_browsertest.cc
@@ -11,7 +11,7 @@
 #include "chrome/browser/extensions/extensions_service.h"
 #include "chrome/browser/extensions/test_extension_loader.h"
 #include "chrome/browser/profile.h"
-#include "chrome/browser/tab_contents/site_instance.h"
+#include "chrome/browser/renderer_host/site_instance.h"
 #include "chrome/browser/views/extensions/extension_shelf.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
diff --git a/chrome/browser/extensions/extension_host.cc b/chrome/browser/extensions/extension_host.cc
index 4373bd0..94b759d 100644
--- a/chrome/browser/extensions/extension_host.cc
+++ b/chrome/browser/extensions/extension_host.cc
@@ -16,8 +16,8 @@
 #include "chrome/browser/renderer_host/render_process_host.h"
 #include "chrome/browser/renderer_host/render_widget_host.h"
 #include "chrome/browser/renderer_host/render_widget_host_view.h"
+#include "chrome/browser/renderer_host/site_instance.h"
 #include "chrome/browser/tab_contents/infobar_delegate.h"
-#include "chrome/browser/tab_contents/site_instance.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tab_contents/tab_contents_view.h"
 #include "chrome/common/extensions/extension.h"
diff --git a/chrome/browser/extensions/extension_process_manager.cc b/chrome/browser/extensions/extension_process_manager.cc
index 7ec8433..4c2047b 100644
--- a/chrome/browser/extensions/extension_process_manager.cc
+++ b/chrome/browser/extensions/extension_process_manager.cc
@@ -8,7 +8,7 @@
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extensions_service.h"
 #include "chrome/browser/profile.h"
-#include "chrome/browser/tab_contents/site_instance.h"
+#include "chrome/browser/renderer_host/site_instance.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/notification_type.h"
diff --git a/chrome/browser/extensions/extension_process_manager_unittest.cc b/chrome/browser/extensions/extension_process_manager_unittest.cc
index 43d3048..5697dc0 100644
--- a/chrome/browser/extensions/extension_process_manager_unittest.cc
+++ b/chrome/browser/extensions/extension_process_manager_unittest.cc
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/extension_process_manager.h"
-#include "chrome/browser/tab_contents/site_instance.h"
+#include "chrome/browser/renderer_host/site_instance.h"
 #include "chrome/common/extensions/extension_error_reporter.h"
 #include "chrome/test/testing_profile.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/importer/importer.cc b/chrome/browser/importer/importer.cc
index 5af5572..0d9788a 100644
--- a/chrome/browser/importer/importer.cc
+++ b/chrome/browser/importer/importer.cc
@@ -28,9 +28,9 @@
 #include "chrome/browser/importer/ie_importer.h"
 #endif
 #include "chrome/browser/importer/toolbar_importer.h"
+#include "chrome/browser/renderer_host/site_instance.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/browser/shell_integration.h"
-#include "chrome/browser/tab_contents/site_instance.h"
 #include "chrome/browser/webdata/web_data_service.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
diff --git a/chrome/browser/renderer_host/render_view_host.cc b/chrome/browser/renderer_host/render_view_host.cc
index 0d3d2f9..d41cac3 100644
--- a/chrome/browser/renderer_host/render_view_host.cc
+++ b/chrome/browser/renderer_host/render_view_host.cc
@@ -22,7 +22,7 @@
 #include "chrome/browser/renderer_host/render_view_host_delegate.h"
 #include "chrome/browser/renderer_host/render_widget_host.h"
 #include "chrome/browser/renderer_host/render_widget_host_view.h"
-#include "chrome/browser/tab_contents/site_instance.h"
+#include "chrome/browser/renderer_host/site_instance.h"
 #include "chrome/common/bindings_policy.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/notification_type.h"
diff --git a/chrome/browser/tab_contents/render_view_host_manager.cc b/chrome/browser/renderer_host/render_view_host_manager.cc
index 68421a7..90548cf 100644
--- a/chrome/browser/tab_contents/render_view_host_manager.cc
+++ b/chrome/browser/renderer_host/render_view_host_manager.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 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/tab_contents/render_view_host_manager.h"
+#include "chrome/browser/renderer_host/render_view_host_manager.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ -12,9 +12,9 @@
 #include "chrome/browser/renderer_host/render_view_host_delegate.h"
 #include "chrome/browser/renderer_host/render_view_host_factory.h"
 #include "chrome/browser/renderer_host/render_widget_host_view.h"
+#include "chrome/browser/renderer_host/site_instance.h"
 #include "chrome/browser/tab_contents/navigation_controller.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
-#include "chrome/browser/tab_contents/site_instance.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/notification_type.h"
diff --git a/chrome/browser/tab_contents/render_view_host_manager.h b/chrome/browser/renderer_host/render_view_host_manager.h
index 11ec445..0cc1504 100644
--- a/chrome/browser/tab_contents/render_view_host_manager.h
+++ b/chrome/browser/renderer_host/render_view_host_manager.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 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_TAB_CONTENTS_RENDER_VIEW_HOST_MANAGER_H_
-#define CHROME_BROWSER_TAB_CONTENTS_RENDER_VIEW_HOST_MANAGER_H_
+#ifndef CHROME_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_MANAGER_H_
+#define CHROME_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_MANAGER_H_
 
 #include "base/basictypes.h"
 #include "base/scoped_ptr.h"
@@ -260,4 +260,4 @@ struct RenderViewHostSwitchedDetails {
   RenderViewHost* new_host;
 };
 
-#endif  // CHROME_BROWSER_TAB_CONTENTS_RENDER_VIEW_HOST_MANAGER_H_
+#endif  // CHROME_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_MANAGER_H_
diff --git a/chrome/browser/tab_contents/render_view_host_manager_unittest.cc b/chrome/browser/renderer_host/render_view_host_manager_unittest.cc
index 7a4bcc5..7a4bcc5 100644
--- a/chrome/browser/tab_contents/render_view_host_manager_unittest.cc
+++ b/chrome/browser/renderer_host/render_view_host_manager_unittest.cc
diff --git a/chrome/browser/tab_contents/site_instance.cc b/chrome/browser/renderer_host/site_instance.cc
index a3e2f86..a038347 100644
--- a/chrome/browser/tab_contents/site_instance.cc
+++ b/chrome/browser/renderer_host/site_instance.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/site_instance.h"
+#include "chrome/browser/renderer_host/site_instance.h"
 
 #include "chrome/browser/dom_ui/dom_ui_factory.h"
 #include "chrome/browser/renderer_host/browser_render_process_host.h"
diff --git a/chrome/browser/tab_contents/site_instance.h b/chrome/browser/renderer_host/site_instance.h
index 81c182d..4773007 100644
--- a/chrome/browser/tab_contents/site_instance.h
+++ b/chrome/browser/renderer_host/site_instance.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 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_TAB_CONTENTS_SITE_INSTANCE_H_
-#define CHROME_BROWSER_TAB_CONTENTS_SITE_INSTANCE_H_
+#ifndef CHROME_BROWSER_RENDERER_HOST_SITE_INSTANCE_H_
+#define CHROME_BROWSER_RENDERER_HOST_SITE_INSTANCE_H_
 
 #include "chrome/browser/browsing_instance.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
@@ -174,7 +174,7 @@ class SiteInstance : public base::RefCounted<SiteInstance>,
   // Whether SetSite has been called.
   bool has_site_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(SiteInstance);
+  DISALLOW_COPY_AND_ASSIGN(SiteInstance);
 };
 
-#endif  // CHROME_BROWSER_TAB_CONTENTS_SITE_INSTANCE_H_
+#endif  // CHROME_BROWSER_RENDERER_HOST_SITE_INSTANCE_H_
diff --git a/chrome/browser/tab_contents/site_instance_unittest.cc b/chrome/browser/renderer_host/site_instance_unittest.cc
index 12bb9f9..12bb9f9 100644
--- a/chrome/browser/tab_contents/site_instance_unittest.cc
+++ b/chrome/browser/renderer_host/site_instance_unittest.cc
diff --git a/chrome/browser/renderer_host/test_render_view_host.h b/chrome/browser/renderer_host/test_render_view_host.h
index 37b100a..008ab19 100644
--- a/chrome/browser/renderer_host/test_render_view_host.h
+++ b/chrome/browser/renderer_host/test_render_view_host.h
@@ -12,7 +12,7 @@
 #include "chrome/browser/renderer_host/render_widget_host_view.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/renderer_host/render_view_host_factory.h"
-#include "chrome/browser/tab_contents/site_instance.h"
+#include "chrome/browser/renderer_host/site_instance.h"
 #include "chrome/browser/tab_contents/test_web_contents.h"
 #include "chrome/test/testing_profile.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/tab_contents/navigation_controller.cc b/chrome/browser/tab_contents/navigation_controller.cc
index b5ae80b..ef27e74 100644
--- a/chrome/browser/tab_contents/navigation_controller.cc
+++ b/chrome/browser/tab_contents/navigation_controller.cc
@@ -13,10 +13,10 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_url_handler.h"
 #include "chrome/browser/profile.h"
+#include "chrome/browser/renderer_host/site_instance.h"
 #include "chrome/browser/sessions/session_types.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/browser/tab_contents/repost_form_warning.h"
-#include "chrome/browser/tab_contents/site_instance.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/navigation_types.h"
 #include "chrome/common/notification_service.h"
diff --git a/chrome/browser/tab_contents/navigation_entry.h b/chrome/browser/tab_contents/navigation_entry.h
index 8e55746..366b460 100644
--- a/chrome/browser/tab_contents/navigation_entry.h
+++ b/chrome/browser/tab_contents/navigation_entry.h
@@ -8,8 +8,8 @@
 #include "base/basictypes.h"
 #include "base/scoped_ptr.h"
 #include "base/string_util.h"
+#include "chrome/browser/renderer_host/site_instance.h"
 #include "chrome/browser/tab_contents/security_style.h"
-#include "chrome/browser/tab_contents/site_instance.h"
 #include "chrome/common/page_transition_types.h"
 #include "googleurl/src/gurl.h"
 #include "grit/theme_resources.h"
diff --git a/chrome/browser/tab_contents/render_view_host_delegate_helper.cc b/chrome/browser/tab_contents/render_view_host_delegate_helper.cc
index 0395ab1..b8c4c0e 100644
--- a/chrome/browser/tab_contents/render_view_host_delegate_helper.cc
+++ b/chrome/browser/tab_contents/render_view_host_delegate_helper.cc
@@ -12,7 +12,7 @@
 #include "chrome/browser/renderer_host/render_process_host.h"
 #include "chrome/browser/renderer_host/render_widget_host.h"
 #include "chrome/browser/renderer_host/render_widget_host_view.h"
-#include "chrome/browser/tab_contents/site_instance.h"
+#include "chrome/browser/renderer_host/site_instance.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tab_contents/tab_contents_view.h"
 #include "chrome/common/chrome_switches.h"
diff --git a/chrome/browser/tab_contents/tab_contents.h b/chrome/browser/tab_contents/tab_contents.h
index e675400..0bbaa0b 100644
--- a/chrome/browser/tab_contents/tab_contents.h
+++ b/chrome/browser/tab_contents/tab_contents.h
@@ -23,11 +23,11 @@
 #include "chrome/browser/find_notification_details.h"
 #include "chrome/browser/shell_dialogs.h"
 #include "chrome/browser/renderer_host/render_view_host_delegate.h"
+#include "chrome/browser/renderer_host/render_view_host_manager.h"
 #include "chrome/browser/tab_contents/constrained_window.h"
 #include "chrome/browser/tab_contents/infobar_delegate.h"
 #include "chrome/browser/tab_contents/navigation_controller.h"
 #include "chrome/browser/tab_contents/page_navigator.h"
-#include "chrome/browser/tab_contents/render_view_host_manager.h"
 #include "chrome/common/gears_api.h"
 #include "chrome/common/navigation_types.h"
 #include "chrome/common/notification_registrar.h"
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 2452480..e9c7441 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -1307,6 +1307,8 @@
         'browser/renderer_host/render_view_host_delegate.h',
         'browser/renderer_host/render_view_host_factory.cc',
         'browser/renderer_host/render_view_host_factory.h',
+        'browser/renderer_host/render_view_host_manager.cc',
+        'browser/renderer_host/render_view_host_manager.h',
         'browser/renderer_host/render_widget_helper.cc',
         'browser/renderer_host/render_widget_helper.h',
         'browser/renderer_host/render_widget_host.cc',
@@ -1331,6 +1333,8 @@
         'browser/renderer_host/safe_browsing_resource_handler.h',
         'browser/renderer_host/save_file_resource_handler.cc',
         'browser/renderer_host/save_file_resource_handler.h',
+        'browser/renderer_host/site_instance.cc',
+        'browser/renderer_host/site_instance.h',
         'browser/renderer_host/sync_resource_handler.cc',
         'browser/renderer_host/sync_resource_handler.h',
         'browser/renderer_host/web_cache_manager.cc',
@@ -1441,12 +1445,8 @@
         'browser/tab_contents/render_view_context_menu_mac.h',
         'browser/tab_contents/render_view_host_delegate_helper.cc',
         'browser/tab_contents/render_view_host_delegate_helper.h',
-        'browser/tab_contents/render_view_host_manager.cc',
-        'browser/tab_contents/render_view_host_manager.h',
         'browser/tab_contents/repost_form_warning.h',
         'browser/tab_contents/security_style.h',
-        'browser/tab_contents/site_instance.cc',
-        'browser/tab_contents/site_instance.h',
         'browser/tab_contents/tab_contents.cc',
         'browser/tab_contents/tab_contents.h',
         'browser/tab_contents/tab_contents_delegate.h',
@@ -3497,9 +3497,11 @@
         'browser/privacy_blacklist/blacklist_unittest.cc',
         'browser/profile_manager_unittest.cc',
         'browser/renderer_host/audio_renderer_host_unittest.cc',
+        'browser/renderer_host/render_view_host_manager_unittest.cc',
         'browser/renderer_host/render_view_host_unittest.cc',
         'browser/renderer_host/render_widget_host_unittest.cc',
         'browser/renderer_host/resource_dispatcher_host_unittest.cc',
+        'browser/renderer_host/site_instance_unittest.cc',
         'browser/renderer_host/web_cache_manager_unittest.cc',
         'browser/rlz/rlz_unittest.cc',
         'browser/safe_browsing/bloom_filter_unittest.cc',
@@ -3524,8 +3526,6 @@
         'browser/ssl/ssl_host_state_unittest.cc',
         'browser/tab_contents/navigation_controller_unittest.cc',
         'browser/tab_contents/navigation_entry_unittest.cc',
-        'browser/tab_contents/render_view_host_manager_unittest.cc',
-        'browser/tab_contents/site_instance_unittest.cc',
         'browser/tab_contents/thumbnail_generator_unittest.cc',
         'browser/tab_contents/web_contents_unittest.cc',
         'browser/tabs/tab_strip_model_unittest.cc',