Commit e0cbfc49 authored by kalman@chromium.org's avatar kalman@chromium.org

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
parent cfdbc458
...@@ -3389,9 +3389,7 @@ TEST_F(ExtensionServiceTest, SetUnsetBlacklistInPrefs) { ...@@ -3389,9 +3389,7 @@ TEST_F(ExtensionServiceTest, SetUnsetBlacklistInPrefs) {
#if defined(ENABLE_BLACKLIST_TESTS) #if defined(ENABLE_BLACKLIST_TESTS)
// Tests trying to install a blacklisted extension. // Tests trying to install a blacklisted extension.
// Disabled due to http://crbug.com/315396 TEST_F(ExtensionServiceTest, BlacklistedExtensionWillNotInstall) {
TEST_F(ExtensionServiceTest,
DISABLED_BlacklistedExtensionWillNotInstall) {
scoped_refptr<FakeSafeBrowsingDatabaseManager> blacklist_db( scoped_refptr<FakeSafeBrowsingDatabaseManager> blacklist_db(
new FakeSafeBrowsingDatabaseManager(true)); new FakeSafeBrowsingDatabaseManager(true));
Blacklist::ScopedDatabaseManagerForTest scoped_blacklist_db(blacklist_db); Blacklist::ScopedDatabaseManagerForTest scoped_blacklist_db(blacklist_db);
...@@ -3446,9 +3444,7 @@ TEST_F(ExtensionServiceTest, UnloadBlacklistedExtensionPolicy) { ...@@ -3446,9 +3444,7 @@ TEST_F(ExtensionServiceTest, UnloadBlacklistedExtensionPolicy) {
#if defined(ENABLE_BLACKLIST_TESTS) #if defined(ENABLE_BLACKLIST_TESTS)
// Tests that a blacklisted extension is eventually unloaded on startup, if it // Tests that a blacklisted extension is eventually unloaded on startup, if it
// wasn't already. // wasn't already.
// Disabled due to http://crbug.com/315396 TEST_F(ExtensionServiceTest, WillNotLoadBlacklistedExtensionsFromDirectory) {
TEST_F(ExtensionServiceTest,
DISABLED_WillNotLoadBlacklistedExtensionsFromDirectory) {
scoped_refptr<FakeSafeBrowsingDatabaseManager> blacklist_db( scoped_refptr<FakeSafeBrowsingDatabaseManager> blacklist_db(
new FakeSafeBrowsingDatabaseManager(true)); new FakeSafeBrowsingDatabaseManager(true));
Blacklist::ScopedDatabaseManagerForTest scoped_blacklist_db(blacklist_db); Blacklist::ScopedDatabaseManagerForTest scoped_blacklist_db(blacklist_db);
......
...@@ -142,7 +142,7 @@ class SafeBrowsingServiceFactoryImpl : public SafeBrowsingServiceFactory { ...@@ -142,7 +142,7 @@ class SafeBrowsingServiceFactoryImpl : public SafeBrowsingServiceFactory {
DISALLOW_COPY_AND_ASSIGN(SafeBrowsingServiceFactoryImpl); DISALLOW_COPY_AND_ASSIGN(SafeBrowsingServiceFactoryImpl);
}; };
static base::LazyInstance<SafeBrowsingServiceFactoryImpl> static base::LazyInstance<SafeBrowsingServiceFactoryImpl>::Leaky
g_safe_browsing_service_factory_impl = LAZY_INSTANCE_INITIALIZER; g_safe_browsing_service_factory_impl = LAZY_INSTANCE_INITIALIZER;
// static // static
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment