Revert 132268 - Single URL Expires Were Not Being Deleted.

chrome/browser/visitedlink/visitedlink_master.h

 // Copyright (c) 2011 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.
 
 #ifndef CHROME_BROWSER_VISITEDLINK_VISITEDLINK_MASTER_H_
 #define CHROME_BROWSER_VISITEDLINK_VISITEDLINK_MASTER_H_
 #pragma once
 
 #if defined(OS_WIN)
 #include <windows.h>
 #endif
 #include <set>
 #include <vector>
 
 #include "base/callback_forward.h"
 #include "base/file_path.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/shared_memory.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "chrome/browser/history/history.h"
-#include "chrome/browser/history/history_types.h"
 #include "chrome/common/visitedlink_common.h"
 
 class GURL;
 class Profile;
 
 // Controls the link coloring database. The master controls all writing to the
 // database as well as disk I/O. There should be only one master.
 //
 // This class will defer writing operations to the file thread. This means that
 // class destruction, the file may still be open since operations are pending on
@@ skipping 50 matching lines @@
   bool Init();
 
   base::SharedMemory* shared_memory() { return shared_memory_; }
 
   // Adds a URL to the table.
   void AddURL(const GURL& url);
 
   // Adds a set of URLs to the table.
   void AddURLs(const std::vector<GURL>& url);
 
-  // Deletes the specified URLs from |rows| from the table.
-  void DeleteURLs(const history::URLRows& rows);
+  // Deletes the specified URLs from the table.
+  void DeleteURLs(const std::set<GURL>& urls);
 
   // Clears the visited links table by deleting the file from disk. Used as
   // part of history clearing.
   void DeleteAllURLs();
 
 #if defined(UNIT_TEST) || !defined(NDEBUG) || defined(PERF_TEST)
   // This is a debugging function that can be called to double-check internal
   // data structures. It will assert if the check fails.
   void DebugValidate();
 
@@ skipping 284 matching lines @@
   int32 used_count = 0;
   for (int32 i = 0; i < table_length_; i++) {
     if (hash_table_[i])
       used_count++;
   }
   DCHECK_EQ(used_count, used_items_);
 }
 #endif
 
 #endif  // CHROME_BROWSER_VISITEDLINK_VISITEDLINK_MASTER_H_