diff options
| -rw-r--r-- | chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc | 27 |
1 files changed, 3 insertions, 24 deletions
diff --git a/chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc b/chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc index 6669ca7..bcfe705 100644 --- a/chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc +++ b/chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc @@ -30,29 +30,12 @@ class ContentSettingBubbleModelTest : public ChromeRenderViewHostTestHarness { : ui_thread_(BrowserThread::UI, MessageLoop::current()) { } - void StartIOThread() { - io_thread_.reset(new content::TestBrowserThread(BrowserThread::IO)); - io_thread_->StartIOThread(); - } - virtual void SetUp() OVERRIDE { ChromeRenderViewHostTestHarness::SetUp(); TabSpecificContentSettings::CreateForWebContents(web_contents()); InfoBarService::CreateForWebContents(web_contents()); } - virtual void TearDown() OVERRIDE { - // This will delete the TestingProfile on the UI thread. - ChromeRenderViewHostTestHarness::TearDown(); - - // Finish off deleting the ProtocolHandlerRegistry, which must be done on - // the IO thread. - if (io_thread_.get()) { - io_thread_->Stop(); - io_thread_.reset(NULL); - } - } - void CheckGeolocationBubble(size_t expected_domains, bool expect_clear_link, bool expect_reload_hint) { @@ -73,7 +56,6 @@ class ContentSettingBubbleModelTest : public ChromeRenderViewHostTestHarness { } content::TestBrowserThread ui_thread_; - scoped_ptr<content::TestBrowserThread> io_thread_; }; TEST_F(ContentSettingBubbleModelTest, ImageRadios) { @@ -448,7 +430,7 @@ class FakeDelegate : public ProtocolHandlerRegistry::Delegate { virtual ShellIntegration::DefaultProtocolClientWorker* CreateShellWorker( ShellIntegration::DefaultWebClientObserver* observer, const std::string& protocol) OVERRIDE { - LOG(INFO) << "CreateShellWorker"; + VLOG(1) << "CreateShellWorker"; return NULL; } @@ -460,14 +442,11 @@ class FakeDelegate : public ProtocolHandlerRegistry::Delegate { virtual void RegisterWithOSAsDefaultClient( const std::string& protocol, ProtocolHandlerRegistry* registry) OVERRIDE { - LOG(INFO) << "Register With OS"; + VLOG(1) << "Register With OS"; } }; -// Flakily crashes. http://crbug.com/237389 -TEST_F(ContentSettingBubbleModelTest, DISABLED_RPHAllow) { - StartIOThread(); - +TEST_F(ContentSettingBubbleModelTest, RPHAllow) { ProtocolHandlerRegistry registry(profile(), new FakeDelegate()); registry.InitProtocolSettings(); |