Move BindToCurrentLoop from media/base/ to base/

media/base/test_helpers.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 "media/base/test_helpers.h"
 
 #include "base/bind.h"
+#include "base/bind_to_current_loop.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/pickle.h"
 #include "base/test/test_timeouts.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
 #include "media/base/audio_buffer.h"
-#include "media/base/bind_to_current_loop.h"
 #include "media/base/decoder_buffer.h"
 #include "ui/gfx/geometry/rect.h"
 
 using ::testing::_;
 using ::testing::StrictMock;
 
 namespace media {
 
 // Utility mock for testing methods expecting Closures and PipelineStatusCBs.
 class MockCallback : public base::RefCountedThreadSafe<MockCallback> {
@@ skipping 29 matching lines @@
     : message_loop_(base::MessageLoop::current()),
       signaled_(false),
       status_(PIPELINE_OK) {
   DCHECK(message_loop_);
 }
 
 WaitableMessageLoopEvent::~WaitableMessageLoopEvent() {}
 
 base::Closure WaitableMessageLoopEvent::GetClosure() {
   DCHECK_EQ(message_loop_, base::MessageLoop::current());
-  return BindToCurrentLoop(base::Bind(
+  return base::BindToCurrentLoop(base::Bind(
       &WaitableMessageLoopEvent::OnCallback, base::Unretained(this),
       PIPELINE_OK));
 }
 
 PipelineStatusCB WaitableMessageLoopEvent::GetPipelineStatusCB() {
   DCHECK_EQ(message_loop_, base::MessageLoop::current());
-  return BindToCurrentLoop(base::Bind(
+  return base::BindToCurrentLoop(base::Bind(
       &WaitableMessageLoopEvent::OnCallback, base::Unretained(this)));
 }
 
 void WaitableMessageLoopEvent::RunAndWait() {
   RunAndWaitForStatus(PIPELINE_OK);
 }
 
 void WaitableMessageLoopEvent::RunAndWaitForStatus(PipelineStatus expected) {
   DCHECK_EQ(message_loop_, base::MessageLoop::current());
   if (signaled_) {
@@ skipping 177 matching lines @@
   expecting_b_ = false;
 }
 
 void AddLogEntryForTest(MediaLog::MediaLogLevel level,
                         const std::string& message) {
   DVLOG(1) << "Media log (" << MediaLog::MediaLogLevelToString(level)
            << "): " << message;
 }
 
 }  // namespace media