Collapse HTTP and non-HTTP codepaths into single methods.

webkit/media/buffered_data_source.h

Index: webkit/media/buffered_data_source.h
diff --git a/webkit/media/buffered_data_source.h b/webkit/media/buffered_data_source.h
index b4526cb5458192a04bd04b112c045164b0914544..1580d6f413ad94a04f6d1d1a99dab04c40428fb0 100644
--- a/webkit/media/buffered_data_source.h
+++ b/webkit/media/buffered_data_source.h
@@ -123,29 +123,17 @@ class BufferedDataSource : public media::DataSource {
   // 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);
-
-  // 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 initial load.
+  void StartCallback(BufferedResourceLoader::Status status);
+
+  // BufferedResourceLoader::Start() callback for subsequent loads (i.e.,
+  // when accessing ranges that are outside initial buffered region).
   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 HttpLoadingStateChangedCallback(
-      BufferedResourceLoader::LoadingState state);
-  void HttpProgressCallback(int64 position);
+  void LoadingStateChangedCallback(BufferedResourceLoader::LoadingState state);
+  void ProgressCallback(int64 position);
 
   void UpdateHostState_Locked();