Finish the base::Bind migration for webkit/media.

webkit/media/buffered_resource_loader_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 <string>
 
 #include "base/bind.h"
 #include "base/format_macros.h"
 #include "base/stringprintf.h"
@@ skipping 90 matching lines @@
   void SetLoaderBuffer(size_t forward_capacity, size_t backward_capacity) {
     loader_->buffer_.reset(
         new media::SeekableBuffer(backward_capacity, forward_capacity));
   }
 
   void Start() {
     InSequence s;
     EXPECT_CALL(*url_loader_, loadAsynchronously(Truly(CorrectAcceptEncoding),
                                                  loader_.get()));
     loader_->Start(
-        NewCallback(this, &BufferedResourceLoaderTest::StartCallback),

[scherkus (not reviewing), 2011/12/01 17:42:18]

sanity check: are there .h files we can stop including?

[Ami GONE FROM CHROMIUM, 2011/12/01 18:11:26]

no.

+        base::Bind(&BufferedResourceLoaderTest::StartCallback,
+                   base::Unretained(this)),
         base::Bind(&BufferedResourceLoaderTest::NetworkCallback,
                    base::Unretained(this)),
         view_->mainFrame());
   }
 
   void FullResponse(int64 instance_size) {
     FullResponse(instance_size, net::OK);
   }
 
   void FullResponse(int64 instance_size, int status) {
@@ skipping 109 matching lines @@
     CHECK_LT(buffered, capacity);
 
     EXPECT_CALL(*this, NetworkCallback());
     WriteData(capacity - buffered);
     ConfirmLoaderDeferredState(true);
   }
 
   // Helper method to read from |loader_|.
   void ReadLoader(int64 position, int size, uint8* buffer) {
     loader_->Read(position, size, buffer,
-                  NewCallback(this, &BufferedResourceLoaderTest::ReadCallback));
+                  base::Bind(&BufferedResourceLoaderTest::ReadCallback,
+                             base::Unretained(this)));
   }
 
   // Verifies that data in buffer[0...size] is equal to data_[pos...pos+size].
   void VerifyBuffer(uint8* buffer, int pos, int size) {
     EXPECT_EQ(0, memcmp(buffer, data_ + pos, size));
   }
 
   void ConfirmLoaderOffsets(int64 expected_offset,
                             int expected_first_offset,
                             int expected_last_offset) {
@@ skipping 850 matching lines @@
 
 TEST_F(BufferedResourceLoaderTest, BufferWindow_PlaybackRate_AboveUpperBound) {
   Initialize(kHttpUrl, -1, -1);
   Start();
   loader_->SetPlaybackRate(100);
   CheckBufferWindowBounds();
   StopWhenLoad();
 }
 
 }  // namespace webkit_media