Collapse HTTP and non-HTTP codepaths into single methods.

webkit/media/buffered_data_source.h

 // 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.
 
 #ifndef WEBKIT_MEDIA_BUFFERED_DATA_SOURCE_H_
 #define WEBKIT_MEDIA_BUFFERED_DATA_SOURCE_H_
 
 #include <string>
 
 #include "base/callback.h"
@@ skipping 95 matching lines @@
   void ReadInternal();
 
   // Calls |read_cb_| and reset all read parameters. Non-negative |bytes_read|
   // values represent successful reads, otherwise |bytes_read| should be
   // kReadError.
   void DoneRead_Locked(int bytes_read);
 
   // Calls |initialize_cb_| and reset it.
   void DoneInitialization_Locked(media::PipelineStatus status);
 
-  // Callback method for |loader_| if URL for the resource requested is using
-  // HTTP protocol. This method is called when response for initial request is
-  // received.
-  void HttpInitialStartCallback(BufferedResourceLoader::Status status);
+  // BufferedResourceLoader::Start() callback for initial load.
+  void StartCallback(BufferedResourceLoader::Status status);
 
-  // Callback method for |loader_| if URL for the resource requested is using
-  // a non-HTTP protocol, e.g. local files. This method is called when response
-  // for initial request is received.
-  void NonHttpInitialStartCallback(BufferedResourceLoader::Status status);
-
-  // Callback method to be passed to BufferedResourceLoader during range
-  // request. Once a resource request has started, this method will be called
-  // with the error code. This method will be executed on the thread
-  // BufferedResourceLoader lives, i.e. render thread.
+  // BufferedResourceLoader::Start() callback for subsequent loads (i.e.,
+  // when accessing ranges that are outside initial buffered region).

[Ami GONE FROM CHROMIUM, 2012/07/09 03:30:57]

Old comment made promises about thread of execution.  
Should new code make same/different/no promise?

[scherkus (not reviewing), 2012/07/10 18:37:27]

BRL lives + executes on render thread as do the callbacks -- I'll update BRL's
class comment to be more clear

   void PartialReadStartCallback(BufferedResourceLoader::Status status);
 
-  // Read callback for BufferedResourceLoader.
+  // BufferedResourceLoader callbacks.
   void ReadCallback(BufferedResourceLoader::Status status, int bytes_read);
-
-  // Loading and progress callbacks for HTTP resources.
-  void HttpLoadingCallback(BufferedResourceLoader::LoadingState state);
-  void HttpProgressCallback(int64 position);
+  void LoadingCallback(BufferedResourceLoader::LoadingState state);
+  void ProgressCallback(int64 position);
 
   void UpdateHostState_Locked();
 
   // URL of the resource requested.
   GURL url_;
 
   // Members for total bytes of the requested object. It is written once on
   // render thread but may be read from any thread. However reading of this
   // member is guaranteed to happen after it is first written, so we don't
   // need to protect it.
@@ skipping 69 matching lines @@
   float playback_rate_;
 
   scoped_refptr<media::MediaLog> media_log_;
 
   DISALLOW_COPY_AND_ASSIGN(BufferedDataSource);
 };
 
 }  // namespace webkit_media
 
 #endif  // WEBKIT_MEDIA_BUFFERED_DATA_SOURCE_H_