Design changes in browser/privacy_blacklist needed to integrate

privacy blacklists with extensions.

- change I/O routines interface to be more clear
- distinguish between transient and permanent blacklists
- remove obsolete code (pbl_tool and blacklist error dialog)

BlacklistManager will be responsible for recompiling the persistent
blacklists. Errors will be reported via infobars.

TEST=Covered by unit_tests.
BUG=21541

Review URL: http://codereview.chromium.org/337025

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30449 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 0 insertions, 61 deletions

diff --git a/chrome/tools/pbl_tool/DEPS b/chrome/tools/pbl_tool/DEPS
deleted file mode 100644
index f2208dc..0000000
--- a/chrome/tools/pbl_tool/DEPS
+++ /dev/null
@@ -1,3 +0,0 @@
-include_rules = [
-  "+chrome/browser"
-]
diff --git a/chrome/tools/pbl_tool/pbl_tool.cc b/chrome/tools/pbl_tool/pbl_tool.cc
deleted file mode 100644
index 80deaa2..0000000
--- a/chrome/tools/pbl_tool/pbl_tool.cc
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright (c) 2009 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.
-
-// This tool manages privacy blacklists. Primarily for loading a text
-// blacklist into the binary aggregate blacklist.
-#include <iostream>
-
-#include "base/process_util.h"
-#include "base/string_util.h"
-#include "chrome/browser/privacy_blacklist/blacklist.h"
-#include "chrome/browser/privacy_blacklist/blacklist_io.h"
-
-#ifdef OS_POSIX
-#define ICHAR char
-#define ICERR std::cerr
-#define IMAIN main
-#else
-#define ICHAR wchar_t
-#define ICERR std::wcerr
-#define IMAIN wmain
-#endif
-
-namespace {
-
-int PrintUsage(int argc, ICHAR* argv[]) {
-  ICERR << "Usage: " << argv[0] << " <source>... <target>\n"
-           "       <source> are text blacklists (.pbl) to load.\n"
-           "       <target> is the binary output blacklist repository.\n\n"
-           "Adds all entries from <source> to <target>.\n"
-           "Creates <target> if it does not exist.\n";
-  return 1;
-}
-
-}
-
-int IMAIN(int argc, ICHAR* argv[]) {
-  base::EnableTerminationOnHeapCorruption();
-
-  if (argc < 3)
-    return PrintUsage(argc, argv);
-
-  BlacklistIO io;
-  for (int current = 1; current < argc-1; ++current) {
-    FilePath input(argv[current]);
-    if (!io.Read(input)) {
-      ICERR << "Error reading " << argv[current] << ":\n"
-            << io.last_error() << "\n";
-      return -1;
-    }
-  }
-
-  FilePath output(argv[argc-1]);
-  if (!io.Write(output))
-    ICERR << "Error writing " << argv[2] << ":\n" << io.last_error() << "\n";
-
-  return 0;
-}