Design changes in browser/privacy_blacklist needed to integrate

chrome/browser/browser_main.cc

Index: chrome/browser/browser_main.cc
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc
index c559f70ea8673cdbc04cec62aae33ff1be4ac898..751176661bb516d9b1530fa674a1ec523b973d8c 100644
--- a/chrome/browser/browser_main.cc
+++ b/chrome/browser/browser_main.cc
@@ -41,7 +41,6 @@
 #include "chrome/browser/net/metadata_url_request.h"
 #include "chrome/browser/net/sdch_dictionary_fetcher.h"
 #include "chrome/browser/plugin_service.h"
-#include "chrome/browser/privacy_blacklist/blacklist.h"
 #include "chrome/browser/process_singleton.h"
 #include "chrome/browser/profile_manager.h"
 #include "chrome/browser/renderer_host/resource_dispatcher_host.h"
@@ -102,7 +101,6 @@
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/rlz/rlz.h"
-#include "chrome/browser/views/blacklist_error_dialog.h"
 #include "chrome/browser/views/user_data_dir_dialog.h"
 #include "chrome/common/env_vars.h"
 #include "chrome/installer/util/helper.h"
@@ -579,19 +577,6 @@ int BrowserMain(const MainFunctionParams& parameters) {
   CHECK(profile) << "Cannot get default profile.";
 #endif
 
-  if (profile->GetBlacklist() && !profile->GetBlacklist()->is_good()) {
-    // TODO(idanan): Enable this for other platforms once the dispatching
-    // support code has been ported. See ifdefs in message_loop.h.
-#if defined(OS_WIN)
-    bool accepted = BlacklistErrorDialog::RunBlacklistErrorDialog();
-    if (!accepted)
-      return ResultCodes::NORMAL_EXIT;
-#else
-    return ResultCodes::NORMAL_EXIT;
-#endif
-  }
-
-
   PrefService* user_prefs = profile->GetPrefs();
   DCHECK(user_prefs);