Remove virtual attribute from a bunch of BufferedResourceLoader methods.

These were used for mocking purposes in the past but not anymore!

Review URL: https://chromiumcodereview.appspot.com/10053015

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@131826 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 20 insertions, 25 deletions

diff --git a/webkit/media/buffered_data_source_unittest.cc b/webkit/media/buffered_data_source_unittest.cc
index abd9fd5..6f41127 100644
--- a/webkit/media/buffered_data_source_unittest.cc
+++ b/webkit/media/buffered_data_source_unittest.cc
@@ -56,8 +56,9 @@ class MockBufferedDataSource : public BufferedDataSource {
         .WillByDefault(Assign(&loading_, true));
     ON_CALL(*url_loader, cancel())
         .WillByDefault(Assign(&loading_, false));
-    scoped_ptr<WebURLLoader> wul(url_loader);
-    loader->SetURLLoaderForTest(wul.Pass());
+
+    // |test_loader_| will be used when Start() is called.
+    loader->test_loader_ = scoped_ptr<WebURLLoader>(url_loader);
     return loader;
   }
 
diff --git a/webkit/media/buffered_resource_loader.cc b/webkit/media/buffered_resource_loader.cc
index d92e72d..8757ac1 100644
--- a/webkit/media/buffered_resource_loader.cc
+++ b/webkit/media/buffered_resource_loader.cc
@@ -323,11 +323,6 @@ const GURL& BufferedResourceLoader::url() {
   return url_;
 }
 
-void BufferedResourceLoader::SetURLLoaderForTest(
-    scoped_ptr<WebURLLoader> test_loader) {
-  test_loader_ = test_loader.Pass();
-}
-
 /////////////////////////////////////////////////////////////////////////////
 // WebKit::WebURLLoaderClient implementation.
 void BufferedResourceLoader::willSendRequest(
diff --git a/webkit/media/buffered_resource_loader.h b/webkit/media/buffered_resource_loader.h
index a4cdc5a..d5f6857 100644
--- a/webkit/media/buffered_resource_loader.h
+++ b/webkit/media/buffered_resource_loader.h
@@ -90,15 +90,15 @@ class BufferedResourceLoader : public WebKit::WebURLLoaderClient {
   //   - Loading completed
   //   - Loading failed
   typedef base::Callback<void(Status)> StartCB;
-  virtual void Start(const StartCB& start_cb,
-                     const base::Closure& event_cb,
-                     WebKit::WebFrame* frame);
+  void Start(const StartCB& start_cb,
+             const base::Closure& event_cb,
+             WebKit::WebFrame* frame);
 
   // Stops everything associated with this loader, including active URL loads
   // and pending callbacks.
   //
   // It is safe to delete a BufferedResourceLoader after calling Stop().
-  virtual void Stop();
+  void Stop();
 
   // Copies |read_size| bytes from |position| into |buffer|, executing |read_cb|
   // when the operation has completed.
@@ -109,34 +109,30 @@ class BufferedResourceLoader : public WebKit::WebURLLoaderClient {
   // If necessary will temporarily increase forward capacity of buffer to
   // accomodate an unusually large read.
   typedef base::Callback<void(Status, int)> ReadCB;
-  virtual void Read(int64 position, int read_size,
-                    uint8* buffer, const ReadCB& read_cb);
+  void Read(int64 position, int read_size,
+            uint8* buffer, const ReadCB& read_cb);
 
   // Returns the position of the last byte buffered. Returns
   // |kPositionNotSpecified| if such value is not available.
-  virtual int64 GetBufferedPosition();
+  int64 GetBufferedPosition();
 
   // Gets the content length in bytes of the instance after this loader has been
   // started. If this value is |kPositionNotSpecified|, then content length is
   // unknown.
-  virtual int64 content_length();
+  int64 content_length();
 
   // Gets the original size of the file requested. If this value is
   // |kPositionNotSpecified|, then the size is unknown.
-  virtual int64 instance_size();
+  int64 instance_size();
 
   // Returns true if the server supports byte range requests.
-  virtual bool range_supported();
+  bool range_supported();
 
   // Returns true if the resource loader is currently downloading data.
-  virtual bool is_downloading_data();
+  bool is_downloading_data();
 
   // Returns resulting URL.
-  virtual const GURL& url();
-
-  // |test_loader| will get used the next time Start() is called.
-  virtual void SetURLLoaderForTest(
-      scoped_ptr<WebKit::WebURLLoader> test_loader);
+  const GURL& url();
 
   // WebKit::WebURLLoaderClient implementation.
   virtual void willSendRequest(
@@ -196,6 +192,7 @@ class BufferedResourceLoader : public WebKit::WebURLLoaderClient {
  private:
   friend class BufferedDataSourceTest;
   friend class BufferedResourceLoaderTest;
+  friend class MockBufferedDataSource;
 
   // Updates the |buffer_|'s forward and backward capacities.
   void UpdateBufferWindow();
diff --git a/webkit/media/buffered_resource_loader_unittest.cc b/webkit/media/buffered_resource_loader_unittest.cc
index 82cbb61..d96ab37 100644
--- a/webkit/media/buffered_resource_loader_unittest.cc
+++ b/webkit/media/buffered_resource_loader_unittest.cc
@@ -83,12 +83,14 @@ class BufferedResourceLoaderTest : public testing::Test {
     first_position_ = first_position;
     last_position_ = last_position;
 
-    url_loader_ = new NiceMock<MockWebURLLoader>();
     loader_.reset(new BufferedResourceLoader(
         gurl_, first_position_, last_position_,
         BufferedResourceLoader::kThresholdDefer, 0, 0,
         new media::MediaLog()));
-    loader_->SetURLLoaderForTest(scoped_ptr<WebKit::WebURLLoader>(url_loader_));
+
+    // |test_loader_| will be used when Start() is called.
+    url_loader_ = new NiceMock<MockWebURLLoader>();
+    loader_->test_loader_ = scoped_ptr<WebKit::WebURLLoader>(url_loader_);
   }
 
   void SetLoaderBuffer(int forward_capacity, int backward_capacity) {