Reverting 27379.

chrome/browser/visitedlink_master.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/visitedlink_master.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <io.h>
 #include <shlobj.h>
@@ skipping 147 matching lines @@
 //
 // The builder will store the fingerprints for those URLs, and then marshalls
 // back to the main thread where the VisitedLinkMaster will be notified. The
 // master then replaces its table with a new table containing the computed
 // fingerprints.
 //
 // The builder must remain active while the history system is using it.
 // Sometimes, the master will be deleted before the rebuild is complete, in
 // which case it notifies the builder via DisownMaster(). The builder will
 // delete itself once rebuilding is complete, and not execute any callback.
-class VisitedLinkMaster::TableBuilder :
-    public HistoryService::URLEnumerator,
-    public base::RefCountedThreadSafe<TableBuilder> {
+class VisitedLinkMaster::TableBuilder : public HistoryService::URLEnumerator,
+                                        public base::RefCounted<TableBuilder> {
  public:
   TableBuilder(VisitedLinkMaster* master,
                const uint8 salt[LINK_SALT_LENGTH]);
 
   // Called on the main thread when the master is being destroyed. This will
   // prevent a crash when the query completes and the master is no longer
   // around. We can not actually do anything but mark this fact, since the
   // table will be being rebuilt simultaneously on the other thread.
   void DisownMaster();
 
@@ skipping 849 matching lines @@
 }
 
 void VisitedLinkMaster::TableBuilder::OnCompleteMainThread() {
   if (master_)
     master_->OnTableRebuildComplete(success_, fingerprints_);
 
   // WILL (generally) DELETE THIS! This balances the AddRef in
   // VisitedLinkMaster::RebuildTableFromHistory.
   Release();
 }