diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-09 21:41:48 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-09 21:41:48 +0000 |
| commit | 526fcbad45cd81bc953aa643bf6b7229497fa919 (patch) | |
| tree | 82c003c6e26c86813ddbe50317294c9449167ae0 /content/browser/site_instance_impl_unittest.cc | |
| parent | 1d421c2af34c43b3478f00fc45ab9fc17aef071b (diff) | |
| download | chromium_src-526fcbad45cd81bc953aa643bf6b7229497fa919.zip chromium_src-526fcbad45cd81bc953aa643bf6b7229497fa919.tar.gz chromium_src-526fcbad45cd81bc953aa643bf6b7229497fa919.tar.bz2 | |
Revert 175822
After more investigation of what it would take to share the webui code framework from chrome with content, it didn't seam feasible to do this. The code in chrome (i.e. ChromeURLDataManager) is heavily tied to chrome, and is used by chrome for non-webui stuff. The JS code is also specific to Chrome. It seems better to not bring in all this stuff to content.
> Allow multiple WebUIControllerFactory objects to be registered. This makes is possible to implement webui inside content.
> Review URL: https://codereview.chromium.org/11783038
TBR=jam@chromium.org
Review URL: https://codereview.chromium.org/11818036
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@175890 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/site_instance_impl_unittest.cc')
| -rw-r--r-- | content/browser/site_instance_impl_unittest.cc | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/content/browser/site_instance_impl_unittest.cc b/content/browser/site_instance_impl_unittest.cc index 98cbee1..59ed0c2d 100644 --- a/content/browser/site_instance_impl_unittest.cc +++ b/content/browser/site_instance_impl_unittest.cc @@ -15,7 +15,7 @@ #include "content/browser/site_instance_impl.h" #include "content/browser/web_contents/navigation_entry_impl.h" #include "content/browser/web_contents/web_contents_impl.h" -#include "content/browser/webui/web_ui_controller_factory_registry.h" +#include "content/public/browser/web_ui_controller_factory.h" #include "content/public/common/content_client.h" #include "content/public/common/content_constants.h" #include "content/public/common/content_switches.h" @@ -47,11 +47,11 @@ class SiteInstanceTestWebUIControllerFactory : public WebUIControllerFactory { } virtual bool UseWebUIForURL(BrowserContext* browser_context, const GURL& url) const OVERRIDE { - return HasWebUIScheme(url); + return GetContentClient()->HasWebUIScheme(url); } virtual bool UseWebUIBindingsForURL(BrowserContext* browser_context, const GURL& url) const OVERRIDE { - return HasWebUIScheme(url); + return GetContentClient()->HasWebUIScheme(url); } virtual bool IsURLAcceptableForWebUI( BrowserContext* browser_context, @@ -61,15 +61,24 @@ class SiteInstanceTestWebUIControllerFactory : public WebUIControllerFactory { } }; +class SiteInstanceTestClient : public TestContentClient { + public: + SiteInstanceTestClient() { + } + + virtual bool HasWebUIScheme(const GURL& url) const OVERRIDE { + return url.SchemeIs(chrome::kChromeUIScheme); + } +}; + class SiteInstanceTestBrowserClient : public TestContentBrowserClient { public: SiteInstanceTestBrowserClient() : privileged_process_id_(-1) { - WebUIControllerFactory::RegisterFactory(&factory_); } - ~SiteInstanceTestBrowserClient() { - WebUIControllerFactoryRegistry::UnregisterFactoryForTesting(&factory_); + virtual WebUIControllerFactory* GetWebUIControllerFactory() OVERRIDE { + return &factory_; } virtual bool IsSuitableHost(RenderProcessHost* process_host, @@ -94,11 +103,14 @@ class SiteInstanceTest : public testing::Test { file_user_blocking_thread_(BrowserThread::FILE_USER_BLOCKING, &message_loop_), io_thread_(BrowserThread::IO, &message_loop_), + old_client_(NULL), old_browser_client_(NULL) { } virtual void SetUp() { + old_client_ = GetContentClient(); old_browser_client_ = GetContentClient()->browser(); + SetContentClient(&client_); GetContentClient()->set_browser_for_testing(&browser_client_); url_util::AddStandardScheme(kPrivilegedScheme); url_util::AddStandardScheme(chrome::kChromeUIScheme); @@ -109,6 +121,7 @@ class SiteInstanceTest : public testing::Test { EXPECT_TRUE(RenderProcessHost::AllHostsIterator().IsAtEnd()); GetContentClient()->set_browser_for_testing(old_browser_client_); + SetContentClient(old_client_); // http://crbug.com/143565 found SiteInstanceTest leaking an // AppCacheDatabase. This happens because some part of the test indirectly @@ -140,7 +153,9 @@ class SiteInstanceTest : public testing::Test { TestBrowserThread file_user_blocking_thread_; TestBrowserThread io_thread_; + SiteInstanceTestClient client_; SiteInstanceTestBrowserClient browser_client_; + ContentClient* old_client_; ContentBrowserClient* old_browser_client_; }; |