Don't derive from ChromeURLDataManager::DataSource, and instead have these classes implement a dele…

chrome/browser/ui/webui/chrome_url_data_manager_backend.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 CHROME_BROWSER_UI_WEBUI_CHROME_URL_DATA_MANAGER_BACKEND_H_
 #define CHROME_BROWSER_UI_WEBUI_CHROME_URL_DATA_MANAGER_BACKEND_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 26 matching lines @@
   typedef int RequestID;
 
   ChromeURLDataManagerBackend();
   ~ChromeURLDataManagerBackend();
 
   // Invoked to create the protocol handler for chrome://.
   static net::URLRequestJobFactory::ProtocolHandler* CreateProtocolHandler(
       ChromeURLDataManagerBackend* backend);
 
   // Adds a DataSource to the collection of data sources.
-  void AddDataSource(ChromeURLDataManager::DataSource* source);
+  void AddDataSource(URLDataSource* source);
 
   // DataSource invokes this. Sends the data to the URLRequest.
   void DataAvailable(RequestID request_id, base::RefCountedMemory* bytes);
 
   static net::URLRequestJob* Factory(net::URLRequest* request,
                                      const std::string& scheme);
 
  private:
   friend class URLRequestChromeJob;
 
   typedef std::map<std::string,
-      scoped_refptr<ChromeURLDataManager::DataSource> > DataSourceMap;
+      scoped_refptr<URLDataSource> > DataSourceMap;
   typedef std::map<RequestID, URLRequestChromeJob*> PendingRequestMap;
 
   // Called by the job when it's starting up.
   // Returns false if |url| is not a URL managed by this object.
   bool StartRequest(const GURL& url, URLRequestChromeJob* job);
 
+  static void CallStartRequest(scoped_refptr<URLDataSource>,

[James Hawkins, 2013/01/14 18:53:54]

nit: Document method and parameters.

Rationale: my internal monologue:

"What does it do beyond calling the StartRequestMethod?"

[jam, 2013/01/14 19:21:18]

Done.

+                               const std::string& path,
+                               bool is_incognito,
+                               int request_id);
+
   // Remove a request from the list of pending requests.
   void RemoveRequest(URLRequestChromeJob* job);
 
   // Returns true if the job exists in |pending_requests_|. False otherwise.
   // Called by ~URLRequestChromeJob to verify that |pending_requests_| is kept
   // up to date.
   bool HasPendingJob(URLRequestChromeJob* job) const;
 
   // Custom sources of data, keyed by source path (e.g. "favicon").
   DataSourceMap data_sources_;
 
   // All pending URLRequestChromeJobs, keyed by ID of the request.
   // URLRequestChromeJob calls into this object when it's constructed and
   // destructed to ensure that the pointers in this map remain valid.
   PendingRequestMap pending_requests_;
 
   // The ID we'll use for the next request we receive.
   RequestID next_request_id_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeURLDataManagerBackend);
 };
 
 net::URLRequestJobFactory::ProtocolHandler*
 CreateDevToolsProtocolHandler(ChromeURLDataManagerBackend* backend,
                               net::NetworkDelegate* network_delegate);
 
 #endif  // CHROME_BROWSER_UI_WEBUI_CHROME_URL_DATA_MANAGER_BACKEND_H_