From 8a7a2d7a721542025da871c789fe858f3bde1211 Mon Sep 17 00:00:00 2001 From: henrika Date: Thu, 18 Feb 2016 01:49:37 -0800 Subject: Revert of SafeBrowsing: DatabaseManager owns the V4GetHashProtocolManager (patchset #6 id:100001 of https://codereview.chromium.org/1700943003/ ) Reason for revert: Speculative revert as Chrome sheriff. I suspect that this CL causes tons of tests on Mac to fail. See e.g. https://uberchromegw.corp.google.com/i/chromium.mac/builders/Mac10.9%20Tests%20%28dbg%29/builds/19690 Callstacks in all failing tests contains references to SafeBrowsing. 1 libbase.dylib 0x00000001195efbc3 _ZN4base5debug10StackTraceC1Ev + 35 2 sync_integration_tests 0x000000010a77225a _ZN4base5debug11LeakTrackerI29SystemURLRequestContextGetterEC2Ev + 58 3 sync_integration_tests 0x000000010a757783 _ZN4base5debug11LeakTrackerI29SystemURLRequestContextGetterEC1Ev + 35 4 sync_integration_tests 0x000000010a757739 _ZN29SystemURLRequestContextGetterC2EP8IOThread + 105 5 sync_integration_tests 0x000000010a7577db _ZN29SystemURLRequestContextGetterC1EP8IOThread + 43 6 sync_integration_tests 0x000000010a75c9a6 _ZN8IOThread24InitSystemRequestContextEv + 246 7 sync_integration_tests 0x000000010a75c866 _ZN8IOThread33system_url_request_context_getterEv + 358 8 sync_integration_tests 0x000000010a9b7cae _ZN18BrowserProcessImpl22system_request_contextEv + 270 9 sync_integration_tests 0x000000010b1c0e55 _ZN13safe_browsing19SafeBrowsingService10InitializeEv + 101 10 sync_integration_tests 0x000000010a9bc17b _ZN18BrowserProcessImpl25CreateSafeBrowsingServiceEv + 331 11 sync_integration_tests 0x000000010a9bbfe3 _ZN18BrowserProcessImpl21safe_browsing_serviceEv + 275 12 sync_integration_tests 0x000000010a8acf61 _ZN36ChromeResourceDispatcherHostDelegateC2Ev + 177 13 sync_integration_tests 0x000000010a8ad1d3 _ZN36ChromeResourceDispatcherHostDelegateC1Ev + 35 14 sync_integration_tests 0x000000010a9bcda5 _ZN18BrowserProcessImpl29ResourceDispatcherHostCreatedEv + 117 15 sync_integration_tests 0x000000010a6141c0 _ZN26ChromeContentBrowserClient29ResourceDispatcherHostCreatedEv + 320 16 libcontent.dylib 0x00000001212ba928 _ZN7content26ResourceDispatcherHostImplC2Ev + 1320 17 libcontent.dylib 0x00000001212baf63 _ZN7content26ResourceDispatcherHostImplC1Ev + 35 Original issue's description: > SafeBrowsing: DatabaseManager owns the V4GetHashProtocolManager > > BUG=543161,561867 > > Committed: https://crrev.com/95bba9fad50442a9ce7ae4fbcc50d1d845d5d399 > Cr-Commit-Position: refs/heads/master@{#376088} TBR=nparker@chromium.org,vakh@chromium.org,kcarattini@chromium.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=543161,561867 Review URL: https://codereview.chromium.org/1709943002 Cr-Commit-Position: refs/heads/master@{#376131} --- components/safe_browsing_db/database_manager.h | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) (limited to 'components/safe_browsing_db/database_manager.h') diff --git a/components/safe_browsing_db/database_manager.h b/components/safe_browsing_db/database_manager.h index a4c229f..8167b3a 100644 --- a/components/safe_browsing_db/database_manager.h +++ b/components/safe_browsing_db/database_manager.h @@ -20,15 +20,8 @@ #include "content/public/common/resource_type.h" #include "url/gurl.h" -namespace net { -class URLRequestContextGetter; -} // namespace net - namespace safe_browsing { -struct V4GetHashProtocolConfig; -class V4GetHashProtocolManager; - // Base class to either the locally-managed or a remotely-managed database. class SafeBrowsingDatabaseManager : public base::RefCountedThreadSafe { @@ -159,19 +152,9 @@ class SafeBrowsingDatabaseManager virtual void StopOnIOThread(bool shutdown) = 0; protected: - // Use this constructor for testing only. - SafeBrowsingDatabaseManager(); - - // Constructs the database manager. - SafeBrowsingDatabaseManager( - net::URLRequestContextGetter* request_context_getter, - const V4GetHashProtocolConfig& config); - - virtual ~SafeBrowsingDatabaseManager(); + virtual ~SafeBrowsingDatabaseManager() {} friend class base::RefCountedThreadSafe; - - std::unique_ptr v4_get_hash_protocol_manager_; }; // class SafeBrowsingDatabaseManager } // namespace safe_browsing -- cgit v1.1