Reverting 27389.

chrome/browser/history/history_unittest.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.
 
 // History unit tests come in two flavors:
 //
 // 1. The more complicated style is that the unit test creates a full history
 //    service. This spawns a background thread for the history backend, and
 //    all communication is asynchronous. This is useful for testing more
 //    complicated things or end-to-end behavior.
@@ skipping 39 matching lines @@
 
 namespace history {
 class HistoryTest;
 }
 
 // Specialize RunnableMethodTraits for HistoryTest so we can create callbacks.
 // None of these callbacks can outlast the test, so there is not need to retain
 // the HistoryTest object.
 template <>
 struct RunnableMethodTraits<history::HistoryTest> {
-  static void RetainCallee(history::HistoryTest* obj) { }
-  static void ReleaseCallee(history::HistoryTest* obj) { }
+  void RetainCallee(history::HistoryTest* obj) { }
+  void ReleaseCallee(history::HistoryTest* obj) { }
 };
 
 namespace history {
 
 namespace {
 
 // Compares the two data values. Used for comparing thumbnail data.
 bool DataEqual(const unsigned char* reference, size_t reference_len,
                const std::vector<unsigned char>& data) {
   if (reference_len != data.size())
@@ skipping 764 matching lines @@
   history_service_ = history;
   history->ScheduleDBTask(task.get(), &request_consumer);
   request_consumer.CancelAllRequests();
   CleanupHistoryService();
   // WARNING: history has now been deleted.
   history = NULL;
   ASSERT_FALSE(task->done_invoked);
 }
 
 }  // namespace history