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 5e1af54a764d38ea2f1b731af13c776a642f460a..206d6b1ae7874418eeaffd6b9ae7d301427750a1 100644
--- a/webkit/media/buffered_data_source.h
+++ b/webkit/media/buffered_data_source.h
@@ -113,28 +113,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).

[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();