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

chrome/browser/bug_report_util.cc

 // 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.
 
 #include "chrome/browser/bug_report_util.h"
 
 #include <sstream>
 #include <string>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/file_version_info.h"
 #include "base/memory/singleton.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/windows_version.h"
 #include "chrome/browser/browser_process_impl.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/safe_browsing/safe_browsing_util.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_version_info.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/common/net/url_fetcher.h"
+#include "content/public/common/url_fetcher_delegate.h"
 #include "googleurl/src/gurl.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
 #include "net/url_request/url_request_status.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "unicode/locid.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/notifications/system_notification.h"
@@ skipping 36 matching lines @@
 #endif
 
 const int64 kInitialRetryDelay = 900000; // 15 minutes
 const int64 kRetryDelayIncreaseFactor = 2;
 const int64 kRetryDelayLimit = 14400000; // 4 hours
 
 
 }  // namespace
 
 
-// Simple URLFetcher::Delegate to clean up URLFetcher on completion.
-class BugReportUtil::PostCleanup : public URLFetcher::Delegate {
+// Simple content::URLFetcherDelegate to clean up URLFetcher on completion.
+class BugReportUtil::PostCleanup : public content::URLFetcherDelegate {
  public:
   PostCleanup(Profile* profile, std::string* post_body,
               int64 previous_delay) : profile_(profile),
                                       post_body_(post_body),
                                       previous_delay_(previous_delay) { }
-  // Overridden from URLFetcher::Delegate.
-  virtual void OnURLFetchComplete(const URLFetcher* source,
-                                  const GURL& url,
-                                  const net::URLRequestStatus& status,
-                                  int response_code,
-                                  const net::ResponseCookies& cookies,
-                                  const std::string& data);
+  // Overridden from content::URLFetcherDelegate.
+  virtual void OnURLFetchComplete(const URLFetcher* source);
 
  protected:
   virtual ~PostCleanup() {}
 
  private:
   Profile* profile_;
   std::string* post_body_;
   int64 previous_delay_;
 
   DISALLOW_COPY_AND_ASSIGN(PostCleanup);
 };
 
 // Don't use the data parameter, instead use the pointer we pass into every
 // post cleanup object - that pointer will be deleted and deleted only on a
 // successful post to the feedback server.
-void BugReportUtil::PostCleanup::OnURLFetchComplete(
-    const URLFetcher* source,
-    const GURL& url,
-    const net::URLRequestStatus& status,
-    int response_code,
-    const net::ResponseCookies& cookies,
-    const std::string& data) {
+void BugReportUtil::PostCleanup::OnURLFetchComplete(const URLFetcher* source) {
 
   std::stringstream error_stream;
+  int response_code = source->response_code();
   if (response_code == kHttpPostSuccessNoContent) {
     // We've sent our report, delete the report data
     delete post_body_;
 
     error_stream << "Success";
   } else {
     // Uh oh, feedback failed, send it off to retry
     if (previous_delay_) {
       if (previous_delay_ < kRetryDelayLimit)
         previous_delay_ *= kRetryDelayIncreaseFactor;
     } else {
       previous_delay_ = kInitialRetryDelay;
     }
     BugReportUtil::DispatchFeedback(profile_, post_body_, previous_delay_);
 
     // Process the error for debug output
     if (response_code == kHttpPostFailNoConnection) {
       error_stream << "No connection to server.";
     } else if ((response_code > kHttpPostFailClientError) &&
         (response_code < kHttpPostFailServerError)) {
       error_stream << "Client error: HTTP response code " << response_code;
     } else if (response_code > kHttpPostFailServerError) {
       error_stream << "Server error: HTTP response code " << response_code;
     } else {
       error_stream << "Unknown error: HTTP response code " << response_code;
     }
   }
 
-  LOG(WARNING) << "FEEDBACK: Submission to feedback server (" << url
+  LOG(WARNING) << "FEEDBACK: Submission to feedback server (" << source->url()
                << ") status: " << error_stream.str();
 
   // Delete the URLFetcher.
   delete source;
   // And then delete ourselves.
   delete this;
 }
 
 // static
 void BugReportUtil::SetOSVersion(std::string* os_version) {
@@ skipping 244 matching lines @@
   if (screenshot_size == NULL)
     screenshot_size = new gfx::Rect();
   return *screenshot_size;
 }
 
 // static
 void BugReportUtil::SetScreenshotSize(const gfx::Rect& rect) {
   gfx::Rect& screen_size = GetScreenshotSize();
   screen_size = rect;
 }