base::Bind: More random cleanups.

content/browser/geolocation/gps_location_provider_unittest_linux.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 "content/browser/browser_thread_impl.h"
 #include "content/browser/geolocation/gps_location_provider_linux.h"
 #include "content/browser/geolocation/libgps_wrapper_linux.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #include "base/bind.h"
@@ skipping 150 matching lines @@
   // Movement. This will block for up to half a second.
   MockLibGps::g_instance_->get_position_.latitude += 0.01;
   MessageLoop::current()->Run();
   provider_->GetPosition(&position);
   EXPECT_EQ(2, MockLibGps::g_instance_->get_position_calls_);
   EXPECT_EQ(1, MockLibGps::g_instance_->gps_open_calls_);
   EXPECT_EQ(2, MockLibGps::g_instance_->gps_read_calls_);
   CheckValidPosition(MockLibGps::g_instance_->get_position_, position);
 }
 
-class EnableGpsOpenTask : public Task {
- public:
-  virtual void Run() {
-    CHECK(MockLibGps::g_instance_);
-    MockLibGps::g_instance_->gps_open_ret_ = 0;
-  }
-};
+void EnableGpsOpenCallback() {
+  CHECK(MockLibGps::g_instance_);
+  MockLibGps::g_instance_->gps_open_ret_ = 0;
+}
 
 TEST_F(GeolocationGpsProviderLinuxTests, LibGpsReconnect) {
   // Setup gpsd reconnect interval to be 1000ms to speed up test.
   provider_->SetGpsdReconnectIntervalMillis(1000);
   provider_->SetPollPeriodMovingMillis(200);
   const bool ok = provider_->StartProvider(true);
   EXPECT_TRUE(ok);
   ASSERT_TRUE(MockLibGps::g_instance_);
   // Let gps_open() fails, and so will LibGps::Start().
   // Reconnect will happen in 1000ms.
   MockLibGps::g_instance_->gps_open_ret_ = 1;
   Geoposition position;
   MockLibGps::g_instance_->get_position_.error_code =
       Geoposition::ERROR_CODE_NONE;
   MockLibGps::g_instance_->get_position_.latitude = 4.5;
   MockLibGps::g_instance_->get_position_.longitude = -34.1;
   MockLibGps::g_instance_->get_position_.accuracy = 345;
   MockLibGps::g_instance_->get_position_.timestamp =
       base::Time::FromDoubleT(200);
   EXPECT_TRUE(MockLibGps::g_instance_->get_position_.IsValidFix());
   // This task makes gps_open() and LibGps::Start() to succeed after
   // 1500ms.
   MessageLoop::current()->PostDelayedTask(
-      FROM_HERE, new EnableGpsOpenTask(), 1500);
+      FROM_HERE, base::Bind(&EnableGpsOpenCallback), 1500);
   MessageLoop::current()->Run();
   provider_->GetPosition(&position);
   EXPECT_TRUE(position.IsInitialized());
   EXPECT_TRUE(position.IsValidFix());
   // 3 gps_open() calls are expected (2 failures and 1 success)
   EXPECT_EQ(1, MockLibGps::g_instance_->get_position_calls_);
   EXPECT_EQ(3, MockLibGps::g_instance_->gps_open_calls_);
   EXPECT_EQ(1, MockLibGps::g_instance_->gps_read_calls_);
 }
 
 #endif  // #if defined(OS_CHROMEOS)
 
 }  // namespace