Remove browsing_instance.h stub file and update all the references.

BUG=None
TEST=trybots

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

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

9 files changed, 15 insertions, 26 deletions

diff --git a/chrome/browser/browsing_instance.h b/chrome/browser/browsing_instance.h
deleted file mode 100644
index eb33add..0000000
--- a/chrome/browser/browsing_instance.h
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright (c) 2010 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_BROWSING_INSTANCE_H_
-#define CHROME_BROWSER_BROWSING_INSTANCE_H_
-#pragma once
-
-// TODO(jam): remove this file when all files have been converted.
-#include "content/browser/browsing_instance.h"
-
-#endif  // CHROME_BROWSER_BROWSING_INSTANCE_H_
diff --git a/chrome/browser/debugger/devtools_manager.cc b/chrome/browser/debugger/devtools_manager.cc
index e7d3b53..7792532 100644
--- a/chrome/browser/debugger/devtools_manager.cc
+++ b/chrome/browser/debugger/devtools_manager.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 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.
 
@@ -9,7 +9,6 @@
 #include "base/auto_reset.h"
 #include "base/message_loop.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/browsing_instance.h"
 #include "chrome/browser/child_process_security_policy.h"
 #include "chrome/browser/debugger/devtools_client_host.h"
 #include "chrome/browser/debugger/devtools_netlog_observer.h"
@@ -23,6 +22,7 @@
 #include "chrome/common/devtools_messages.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
+#include "content/browser/browsing_instance.h"
 #include "googleurl/src/gurl.h"
 
 // static
diff --git a/chrome/browser/extensions/extension_host.cc b/chrome/browser/extensions/extension_host.cc
index 2da87a6..3b4e70a 100644
--- a/chrome/browser/extensions/extension_host.cc
+++ b/chrome/browser/extensions/extension_host.cc
@@ -13,7 +13,6 @@
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_shutdown.h"
 #include "chrome/browser/browser_window.h"
-#include "chrome/browser/browsing_instance.h"
 #include "chrome/browser/debugger/devtools_manager.h"
 #include "chrome/browser/desktop_notification_handler.h"
 #include "chrome/browser/extensions/extension_message_service.h"
@@ -44,6 +43,7 @@
 #include "chrome/common/render_messages_params.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/common/view_types.h"
+#include "content/browser/browsing_instance.h"
 #include "grit/browser_resources.h"
 #include "grit/generated_resources.h"
 #include "ui/base/keycodes/keyboard_codes.h"
diff --git a/chrome/browser/extensions/extension_process_manager.cc b/chrome/browser/extensions/extension_process_manager.cc
index 03e868d..6939f3a 100644
--- a/chrome/browser/extensions/extension_process_manager.cc
+++ b/chrome/browser/extensions/extension_process_manager.cc
@@ -5,15 +5,15 @@
 #include "chrome/browser/extensions/extension_process_manager.h"
 
 #include "chrome/browser/browser_window.h"
-#include "chrome/browser/browsing_instance.h"
+#include "content/browser/browsing_instance.h"
 #if defined(OS_MACOSX)
 #include "chrome/browser/extensions/extension_host_mac.h"
 #endif
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/renderer_host/site_instance.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
+#include "chrome/browser/renderer_host/site_instance.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/extensions/extension.h"
diff --git a/chrome/browser/importer/importer.cc b/chrome/browser/importer/importer.cc
index 03c72cf..fbeace1 100644
--- a/chrome/browser/importer/importer.cc
+++ b/chrome/browser/importer/importer.cc
@@ -11,7 +11,6 @@
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_thread.h"
-#include "chrome/browser/browsing_instance.h"
 #include "chrome/browser/importer/firefox_profile_lock.h"
 #include "chrome/browser/importer/importer_bridge.h"
 #include "chrome/browser/renderer_host/site_instance.h"
@@ -22,6 +21,7 @@
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/webdata/web_data_service.h"
 #include "chrome/common/notification_source.h"
+#include "content/browser/browsing_instance.h"
 #include "grit/generated_resources.h"
 #include "skia/ext/image_operations.h"
 #include "ui/base/l10n/l10n_util.h"
diff --git a/chrome/browser/prerender/prerender_contents.cc b/chrome/browser/prerender/prerender_contents.cc
index 7095ecf..4b1162b 100644
--- a/chrome/browser/prerender/prerender_contents.cc
+++ b/chrome/browser/prerender/prerender_contents.cc
@@ -6,7 +6,6 @@
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/background_contents_service.h"
-#include "chrome/browser/browsing_instance.h"
 #include "chrome/browser/prerender/prerender_final_status.h"
 #include "chrome/browser/prerender/prerender_manager.h"
 #include "chrome/browser/profiles/profile.h"
@@ -16,10 +15,11 @@
 #include "chrome/browser/ui/login/login_prompt.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/notification_service.h"
-#include "chrome/common/url_constants.h"
-#include "chrome/common/view_types.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/render_messages_params.h"
+#include "chrome/common/url_constants.h"
+#include "chrome/common/view_types.h"
+#include "content/browser/browsing_instance.h"
 #include "ui/gfx/rect.h"
 
 namespace prerender {
diff --git a/chrome/browser/tab_contents/background_contents.cc b/chrome/browser/tab_contents/background_contents.cc
index d5e113c..8fc5c8c 100644
--- a/chrome/browser/tab_contents/background_contents.cc
+++ b/chrome/browser/tab_contents/background_contents.cc
@@ -5,7 +5,6 @@
 #include "chrome/browser/tab_contents/background_contents.h"
 
 #include "chrome/browser/background_contents_service.h"
-#include "chrome/browser/browsing_instance.h"
 #include "chrome/browser/desktop_notification_handler.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
@@ -13,9 +12,10 @@
 #include "chrome/browser/renderer_preferences_util.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/notification_service.h"
+#include "chrome/common/render_messages_params.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/common/view_types.h"
-#include "chrome/common/render_messages_params.h"
+#include "content/browser/browsing_instance.h"
 #include "ui/gfx/rect.h"
 
 ////////////////
diff --git a/content/browser/site_instance.cc b/content/browser/site_instance.cc
index 642a6b7..6a2ef4a 100644
--- a/content/browser/site_instance.cc
+++ b/content/browser/site_instance.cc
@@ -4,12 +4,12 @@
 
 #include "content/browser/site_instance.h"
 
-#include "chrome/browser/browsing_instance.h"
 #include "chrome/browser/extensions/extension_service.h"
-#include "chrome/browser/webui/web_ui_factory.h"
 #include "chrome/browser/renderer_host/browser_render_process_host.h"
+#include "chrome/browser/webui/web_ui_factory.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/url_constants.h"
+#include "content/browser/browsing_instance.h"
 #include "net/base/registry_controlled_domain.h"
 
 // We treat javascript:, about:crash, about:hang, and about:shorthang as the
diff --git a/content/browser/site_instance_unittest.cc b/content/browser/site_instance_unittest.cc
index cc3651f..1b072aa 100644
--- a/content/browser/site_instance_unittest.cc
+++ b/content/browser/site_instance_unittest.cc
@@ -6,9 +6,10 @@
 #include "base/string16.h"
 #include "chrome/browser/renderer_host/browser_render_process_host.h"
 #include "chrome/common/chrome_constants.h"
-#include "chrome/common/url_constants.h"
 #include "chrome/common/render_messages.h"
+#include "chrome/common/url_constants.h"
 #include "chrome/test/testing_profile.h"
+#include "content/browser/browsing_instance.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "content/browser/browsing_instance.h"
 #include "content/browser/child_process_security_policy.h"