Revert of Port HistoryService::GetVisibleVisitCountToHost to CancelableTaskTracker

chrome/browser/safe_browsing/browser_feature_extractor_unittest.cc

 // Copyright (c) 2012 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/safe_browsing/browser_feature_extractor.h"
 
 #include <map>
 #include <string>
 #include <vector>
 
@@ skipping 192 matching lines @@
   }
 
   int num_pending_;  // Number of pending feature extractions.
   scoped_ptr<BrowserFeatureExtractor> extractor_;
   std::map<void*, bool> success_;
   scoped_ptr<BrowseInfo> browse_info_;
   scoped_ptr<StrictMock<MockClientSideDetectionHost> > host_;
   scoped_refptr<StrictMock<MockSafeBrowsingDatabaseManager> > db_manager_;
 
  private:
-  void ExtractFeaturesDone(bool success,
-                           scoped_ptr<ClientPhishingRequest> request) {
-    EXPECT_TRUE(BrowserThread::CurrentlyOn(BrowserThread::UI));
-    ASSERT_EQ(0U, success_.count(request.get()));
-    // The pointer doesn't really belong to us.  It belongs to
-    // the test case which passed it to ExtractFeatures above.
-    success_[request.release()] = success;
+  void ExtractFeaturesDone(bool success, ClientPhishingRequest* request) {
+    ASSERT_EQ(0U, success_.count(request));
+    success_[request] = success;
     if (--num_pending_ == 0) {
       base::MessageLoop::current()->Quit();
     }
   }
 
   void ExtractMalwareFeaturesDone(
       bool success,
       scoped_ptr<ClientMalwareRequest> request) {
     EXPECT_TRUE(BrowserThread::CurrentlyOn(BrowserThread::UI));
     ASSERT_EQ(0U, success_.count(request.get()));
@@ skipping 419 matching lines @@
     // First ip is good but all the others are bad.
     EXPECT_CALL(*db_manager_, MatchMalwareIP(ip)).WillOnce(Return(i > 0));
   }
 
   ExtractMalwareFeatures(&request);
   // The number of IP matched url we store is capped at 5 IPs per request.
   EXPECT_EQ(5, request.bad_ip_url_info_size());
 }
 
 }  // namespace safe_browsing