summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-24 01:01:00 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-24 01:01:00 +0000
commit393652115deeb8efb8068bf3f3242fce4d12a77d (patch)
tree88ed5ac276308964d64e212bd341387896f4d213 /content
parent420138333ca7e2a5f6e5738a43f3780c98a03d42 (diff)
downloadchromium_src-393652115deeb8efb8068bf3f3242fce4d12a77d.zip
chromium_src-393652115deeb8efb8068bf3f3242fce4d12a77d.tar.gz
chromium_src-393652115deeb8efb8068bf3f3242fce4d12a77d.tar.bz2
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
Diffstat (limited to 'content')
-rw-r--r--content/browser/site_instance.cc4
-rw-r--r--content/browser/site_instance_unittest.cc3
2 files changed, 4 insertions, 3 deletions
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"