diff options
| author | kalman@chromium.org <kalman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-07 00:10:10 +0000 |
|---|---|---|
| committer | kalman@chromium.org <kalman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-07 00:10:10 +0000 |
| commit | e0cbfc49b0ecbde83ca6638f7f416fa119686d9c (patch) | |
| tree | 92239bbd4e832cb9bd63aacdc629ed5880cf4395 | |
| parent | cfdbc4587244537d6627de4029dcaf23582b7120 (diff) | |
| download | chromium_src-e0cbfc49b0ecbde83ca6638f7f416fa119686d9c.zip chromium_src-e0cbfc49b0ecbde83ca6638f7f416fa119686d9c.tar.gz chromium_src-e0cbfc49b0ecbde83ca6638f7f416fa119686d9c.tar.bz2 | |
Add ::Leaky to the LazyInstance<SafeBrowsingServiceFactoryImpl> in
safe_browsing_service.cc. Hopefully this will fix the "pure virtual method
called" errors seen in various ExtensionService tests that use safe browsing;
both those reverted as part of bug 233290, and the ones that are still live.
BUG=233290
R=jyasskin@chromium.org
TBR=shess@chromium.org
Review URL: https://codereview.chromium.org/60833007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@233426 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/extensions/extension_service_unittest.cc | 8 | ||||
| -rw-r--r-- | chrome/browser/safe_browsing/safe_browsing_service.cc | 2 |
2 files changed, 3 insertions, 7 deletions
diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc index 335b9ab..9723fdf 100644 --- a/chrome/browser/extensions/extension_service_unittest.cc +++ b/chrome/browser/extensions/extension_service_unittest.cc @@ -3389,9 +3389,7 @@ TEST_F(ExtensionServiceTest, SetUnsetBlacklistInPrefs) { #if defined(ENABLE_BLACKLIST_TESTS) // Tests trying to install a blacklisted extension. -// Disabled due to http://crbug.com/315396 -TEST_F(ExtensionServiceTest, - DISABLED_BlacklistedExtensionWillNotInstall) { +TEST_F(ExtensionServiceTest, BlacklistedExtensionWillNotInstall) { scoped_refptr<FakeSafeBrowsingDatabaseManager> blacklist_db( new FakeSafeBrowsingDatabaseManager(true)); Blacklist::ScopedDatabaseManagerForTest scoped_blacklist_db(blacklist_db); @@ -3446,9 +3444,7 @@ TEST_F(ExtensionServiceTest, UnloadBlacklistedExtensionPolicy) { #if defined(ENABLE_BLACKLIST_TESTS) // Tests that a blacklisted extension is eventually unloaded on startup, if it // wasn't already. -// Disabled due to http://crbug.com/315396 -TEST_F(ExtensionServiceTest, - DISABLED_WillNotLoadBlacklistedExtensionsFromDirectory) { +TEST_F(ExtensionServiceTest, WillNotLoadBlacklistedExtensionsFromDirectory) { scoped_refptr<FakeSafeBrowsingDatabaseManager> blacklist_db( new FakeSafeBrowsingDatabaseManager(true)); Blacklist::ScopedDatabaseManagerForTest scoped_blacklist_db(blacklist_db); diff --git a/chrome/browser/safe_browsing/safe_browsing_service.cc b/chrome/browser/safe_browsing/safe_browsing_service.cc index c7aba0b..6f15f1c 100644 --- a/chrome/browser/safe_browsing/safe_browsing_service.cc +++ b/chrome/browser/safe_browsing/safe_browsing_service.cc @@ -142,7 +142,7 @@ class SafeBrowsingServiceFactoryImpl : public SafeBrowsingServiceFactory { DISALLOW_COPY_AND_ASSIGN(SafeBrowsingServiceFactoryImpl); }; -static base::LazyInstance<SafeBrowsingServiceFactoryImpl> +static base::LazyInstance<SafeBrowsingServiceFactoryImpl>::Leaky g_safe_browsing_service_factory_impl = LAZY_INSTANCE_INITIALIZER; // static |