Use DISABLE_RUNNABLE_METHOD_REFCOUNT macro in several places.

chrome/browser/password_manager/native_backend_kwallet_x_unittest.cc

 // 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.
 
 #include <algorithm>
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 472 matching lines @@
 }
 
 TEST_F(NativeBackendKWalletTest, BasicStartup) {
   NativeBackendKWalletStub kwallet(42, profile_.GetPrefs());
   EXPECT_TRUE(kwallet.InitWithBus(mock_session_bus_));
   EXPECT_FALSE(klauncher_contacted_);
 }
 
 // NativeBackendKWallet isn't reference counted, but in these unit tests that
 // won't be a problem as it always outlives the threads we post tasks to.
-template<>
-struct RunnableMethodTraits<NativeBackendKWalletStub> {
-  void RetainCallee(NativeBackendKWalletStub*) {}
-  void ReleaseCallee(NativeBackendKWalletStub*) {}
-};
+DISABLE_RUNNABLE_METHOD_REFCOUNT(NativeBackendKWalletStub);
 
 TEST_F(NativeBackendKWalletTest, BasicAddLogin) {
   // Pretend that the migration has already taken place.
   profile_.GetPrefs()->SetBoolean(prefs::kPasswordsUseLocalProfileId, true);
 
   NativeBackendKWalletStub backend(42, profile_.GetPrefs());
   EXPECT_TRUE(backend.InitWithBus(mock_session_bus_));
 
   // I'm not sure why base::Bind doesn't like NativeBackendKWallet[Stub], but
   // it results in compile asserts in the templatized magic of base/callback.h.
@@ skipping 483 matching lines @@
 
     RunDBThread();
 
     // The other two copies of the password in different profiles should remain.
     CheckPasswordForms("Chrome Form Data", expected);
     CheckPasswordForms("Chrome Form Data (42)", expected);
     expected.clear();
     CheckPasswordForms("Chrome Form Data (24)", expected);
   }
 }