| Index: chrome/browser/profile.cc
|
| diff --git a/chrome/browser/profile.cc b/chrome/browser/profile.cc
|
| index e9b76d9c22ff773c2afc94e2200b3ceaa0fd2377..6bd2104accbdb503f3a15bd74d38574e6983097d 100644
|
| --- a/chrome/browser/profile.cc
|
| +++ b/chrome/browser/profile.cc
|
| @@ -47,7 +47,6 @@
|
| #include "chrome/browser/notifications/desktop_notification_service.h"
|
| #include "chrome/browser/password_manager/password_store_default.h"
|
| #include "chrome/browser/pref_value_store.h"
|
| -#include "chrome/browser/privacy_blacklist/blacklist.h"
|
| #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h"
|
| #include "chrome/browser/profile_manager.h"
|
| #include "chrome/browser/renderer_host/render_process_host.h"
|
| @@ -546,10 +545,6 @@ class OffTheRecordProfileImpl : public Profile,
|
| return profile_->GetGeolocationPermissionContext();
|
| }
|
|
|
| - virtual Blacklist* GetPrivacyBlacklist() {
|
| - return profile_->GetPrivacyBlacklist();
|
| - }
|
| -
|
| virtual UserStyleSheetWatcher* GetUserStyleSheetWatcher() {
|
| return profile_->GetUserStyleSheetWatcher();
|
| }
|
| @@ -1254,15 +1249,6 @@ GeolocationPermissionContext* ProfileImpl::GetGeolocationPermissionContext() {
|
| return geolocation_permission_context_.get();
|
| }
|
|
|
| -Blacklist* ProfileImpl::GetPrivacyBlacklist() {
|
| - if (!CommandLine::ForCurrentProcess()->HasSwitch(
|
| - switches::kEnablePrivacyBlacklists))
|
| - return NULL;
|
| - if (!privacy_blacklist_.get())
|
| - privacy_blacklist_ = new Blacklist(GetPrefs());
|
| - return privacy_blacklist_.get();
|
| -}
|
| -
|
| UserStyleSheetWatcher* ProfileImpl::GetUserStyleSheetWatcher() {
|
| if (!user_style_sheet_watcher_.get()) {
|
| user_style_sheet_watcher_ = new UserStyleSheetWatcher(GetPath());
|
|
|