Design changes in browser/privacy_blacklist needed to integrate

chrome/browser/profile.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/profile.h"
 
 #include "app/theme_provider.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
@@ skipping 11 matching lines @@
 #include "chrome/browser/extensions/extensions_service.h"
 #include "chrome/browser/extensions/user_script_master.h"
 #include "chrome/browser/favicon_service.h"
 #include "chrome/browser/strict_transport_security_persister.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/in_process_webkit/webkit_context.h"
 #include "chrome/browser/net/chrome_url_request_context.h"
 #include "chrome/browser/net/ssl_config_service_manager.h"
 #include "chrome/browser/notifications/desktop_notification_service.h"
 #include "chrome/browser/password_manager/password_store_default.h"
-#include "chrome/browser/privacy_blacklist/blacklist.h"
+#include "chrome/browser/privacy_blacklist/blacklist_io.h"
 #include "chrome/browser/profile_manager.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
 #include "chrome/browser/search_engines/template_url_fetcher.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/browser/sessions/session_service.h"
 #include "chrome/browser/sessions/tab_restore_service.h"
 #include "chrome/browser/spellchecker.h"
 #include "chrome/browser/ssl/ssl_host_state.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/thumbnail_store.h"
@@ skipping 544 matching lines @@
 
   if (CommandLine::ForCurrentProcess()->
       HasSwitch(switches::kPrivacyBlacklist)) {
     std::wstring option = CommandLine::ForCurrentProcess()->GetSwitchValue(
         switches::kPrivacyBlacklist);
 #if defined(OS_POSIX)
     FilePath path(WideToUTF8(option));
 #else
     FilePath path(option);
 #endif
-    blacklist_ = new Blacklist(path);
+    blacklist_.reset(new Blacklist);
+    // TODO(phajdan.jr): Handle errors when reading blacklist.
+    BlacklistIO::ReadBinary(blacklist_.get(), path);
   }
 
 #if defined(OS_MACOSX)
   // If the profile directory doesn't already have a cache directory and it
   // is under ~/Library/Application Support, use a suitable cache directory
   // under ~/Library/Caches.  For example, a profile directory of
   // ~/Library/Application Support/Google/Chrome/MyProfileName that doesn't
   // have a "Cache" or "MediaCache" subdirectory would use the cache directory
   // ~/Library/Caches/Google/Chrome/MyProfileName.
   //
@@ skipping 142 matching lines @@
     net::SetURLRequestContextForOCSP(NULL);
 #endif
     default_request_context_ = NULL;
   }
 
   CleanupRequestContext(request_context_);
   CleanupRequestContext(media_request_context_);
   CleanupRequestContext(extensions_request_context_);
 
   // When the request contexts are gone, the blacklist wont be needed anymore.
-  delete blacklist_;
-  blacklist_ = 0;
+  blacklist_.reset();
 
   // HistoryService may call into the BookmarkModel, as such we need to
   // delete HistoryService before the BookmarkModel. The destructor for
   // HistoryService will join with HistoryService's backend thread so that
   // by the time the destructor has finished we're sure it will no longer call
   // into the BookmarkModel.
   history_service_ = NULL;
   bookmark_bar_model_.reset();
 
   // FaviconService depends on HistoryServce so make sure we delete
@@ skipping 191 matching lines @@
   }
 
   return extensions_request_context_;
 }
 
 net::SSLConfigService* ProfileImpl::GetSSLConfigService() {
   return ssl_config_service_manager_->Get();
 }
 
 Blacklist* ProfileImpl::GetBlacklist() {
-  return blacklist_;
+  return blacklist_.get();
 }
 
 HistoryService* ProfileImpl::GetHistoryService(ServiceAccessType sat) {
   if (!history_service_created_) {
     history_service_created_ = true;
     scoped_refptr<HistoryService> history(new HistoryService(this));
     if (!history->Init(GetPath(), GetBookmarkModel()))
       return NULL;
     history_service_.swap(history);
 
@@ skipping 376 matching lines @@
     return sync_service_.get();
   }
 #endif
   return NULL;
 }
 
 void ProfileImpl::InitSyncService() {
   sync_service_.reset(new ProfileSyncService(this));
   sync_service_->Initialize();
 }