Convert URLFetcher::Delegates to use an interface in content/public/common. Also remove the old U...

chrome/browser/metrics/metrics_service.h

 // Copyright (c) 2011 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.
 
 // This file defines a service that collects information about the user
 // experience in order to help improve future versions of the app.
 
 #ifndef CHROME_BROWSER_METRICS_METRICS_SERVICE_H_
 #define CHROME_BROWSER_METRICS_METRICS_SERVICE_H_
 #pragma once
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/process_util.h"
 #include "chrome/browser/io_thread.h"
 #include "chrome/common/metrics_helpers.h"
-#include "content/common/net/url_fetcher.h"
+#include "content/public/common/url_fetcher_delegate.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/external_metrics.h"
 #endif
 
 class BookmarkModel;
 class BookmarkNode;
 class HistogramSynchronizer;
@@ skipping 12 matching lines @@
 namespace prerender {
 bool IsOmniboxEnabled(Profile* profile);
 }
 
 namespace webkit {
 struct WebPluginInfo;
 }
 
 
 class MetricsService : public content::NotificationObserver,
-                       public URLFetcher::Delegate,
+                       public content::URLFetcherDelegate,
                        public MetricsServiceBase {
  public:
   MetricsService();
   virtual ~MetricsService();
 
   // Start/stop the metrics recording and uploading machine.  These should be
   // used on startup and when the user clicks the checkbox in the prefs.
   // StartRecordingOnly starts the metrics recording but not reporting, for use
   // in tests only.
   void Start();
@@ skipping 156 matching lines @@
   void MakeStagedLog();
 
   // Record stats, client ID, Session ID, etc. in a special "first" log.
   void PrepareInitialLog();
 
   // Prepared the staged log to be passed to the server. Upon return,
   // current_fetch_ should be reset with its upload data set to a compressed
   // copy of the staged log.
   void PrepareFetchWithStagedLog();
 
-  // Implementation of URLFetcher::Delegate. Called after transmission
+  // Implementation of content::URLFetcherDelegate. Called after transmission
   // completes (either successfully or with failure).
-  virtual void OnURLFetchComplete(const URLFetcher* source,
-                                  const GURL& url,
-                                  const net::URLRequestStatus& status,
-                                  int response_code,
-                                  const net::ResponseCookies& cookies,
-                                  const std::string& data);
+  virtual void OnURLFetchComplete(const URLFetcher* source);
 
   // Logs debugging details, for the case where the server returns a response
   // code other than 200.
   void LogBadResponseCode();
 
   // Records a window-related notification.
   void LogWindowChange(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details);
 
@@ skipping 155 matching lines @@
   friend class InstantFieldTrial;
   friend bool prerender::IsOmniboxEnabled(Profile* profile);
 
   // Returns true if prefs::kMetricsReportingEnabled is set.
   static bool IsMetricsReportingEnabled();
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(MetricsServiceHelper);
 };
 
 #endif  // CHROME_BROWSER_METRICS_METRICS_SERVICE_H_