| Index: chrome/browser/safe_browsing/safe_browsing_service.h
|
| diff --git a/chrome/browser/safe_browsing/safe_browsing_service.h b/chrome/browser/safe_browsing/safe_browsing_service.h
|
| index eee028f5acb71b2c7a08ec833a9af66a034895d9..0f9ef893152587a4522fea7464ecdf214c4c22d2 100644
|
| --- a/chrome/browser/safe_browsing/safe_browsing_service.h
|
| +++ b/chrome/browser/safe_browsing/safe_browsing_service.h
|
| @@ -76,10 +76,6 @@ class SafeBrowsingService
|
| content::BrowserThread::DeleteOnUIThread>,
|
| public content::NotificationObserver {
|
| public:
|
| - enum ResourceTypesToCheck {
|
| - CHECK_ALL_RESOURCE_TYPES,
|
| - CHECK_ONLY_DANGEROUS_TYPES,
|
| - };
|
|
|
| // Makes the passed |factory| the factory used to instanciate
|
| // a SafeBrowsingService. Useful for tests.
|
| @@ -94,21 +90,6 @@ class SafeBrowsingService
|
| // Create an instance of the safe browsing service.
|
| static SafeBrowsingService* CreateSafeBrowsingService();
|
|
|
| -#if defined(SAFE_BROWSING_DB_REMOTE)
|
| - // Field trial for Android Safe Browsing. This is checked separately in
|
| - // SafeBrowsingFieldTrial.java for controlling the UI.
|
| - bool IsAndroidFieldTrialEnabled() const {
|
| - return is_android_field_trial_enabled_;
|
| - }
|
| -
|
| - // Should we check all types, or just the dangerous ones?
|
| - // We can flip this with a field trial if a non-dangerous type
|
| - // starts getting exploited.
|
| - ResourceTypesToCheck GetResourceTypesToCheck() const {
|
| - return resource_types_to_check_;
|
| - }
|
| -#endif // defined(SAFE_BROWSING_DB_REMOTE)
|
| -
|
| // Called on the UI thread to initialize the service.
|
| void Initialize();
|
|
|
| @@ -290,11 +271,6 @@ class SafeBrowsingService
|
| // Accessed on UI thread.
|
| bool enabled_by_prefs_;
|
|
|
| -#if defined(SAFE_BROWSING_DB_REMOTE)
|
| - bool is_android_field_trial_enabled_;
|
| - ResourceTypesToCheck resource_types_to_check_;
|
| -#endif // defined(SAFE_BROWSING_DB_REMOTE)
|
| -
|
| // Tracks existing PrefServices, and the safe browsing preference on each.
|
| // This is used to determine if any profile is currently using the safe
|
| // browsing service, and to start it up or shut it down accordingly.
|
|
|