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

chrome/browser/extensions/apps_promo.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/extensions/apps_promo.h"
 
 #include "base/base64.h"
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/ntp/shown_sections_handler.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/common/url_constants.h"
+#include "content/common/net/url_fetcher.h"
 #include "net/base/load_flags.h"
 #include "net/url_request/url_request_status.h"
 
 const int AppsPromo::kDefaultAppsCounterMax = 10;
 
 namespace {
 
 // The default logo for the promo.
 const char kDefaultLogo[] = "chrome://theme/IDR_WEBSTORE_ICON";
 
@@ skipping 315 matching lines @@
   }
 }
 
 AppsPromoLogoFetcher::~AppsPromoLogoFetcher() {}
 
 void AppsPromoLogoFetcher::OnURLFetchComplete(const URLFetcher* source) {
   std::string data;
   std::string base64_data;
 
   CHECK(source == url_fetcher_.get());
-  CHECK(source->GetResponseAsString(&data));
+  source->GetResponseAsString(&data);
 
   if (source->status().is_success() &&
       source->response_code() == kHttpSuccess &&
       base::Base64Encode(data, &base64_data)) {
     AppsPromo::SetSourcePromoLogoURL(promo_data_.logo);
     promo_data_.logo = GURL(kPNGDataURLPrefix + base64_data);
   } else {
     // The logo wasn't downloaded correctly or we failed to encode it in
     // base64. Reset the source URL so we fetch it again next time. AppsPromo
     // will revert to the default logo.
@@ skipping 25 matching lines @@
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_WEB_STORE_PROMO_LOADED,
       content::Source<Profile>(profile_),
       content::NotificationService::NoDetails());
 }
 
 bool AppsPromoLogoFetcher::SupportsLogoURL() {
   URLPattern allowed_urls(URLPattern::SCHEME_HTTPS, kValidLogoPattern);
   return allowed_urls.MatchesURL(promo_data_.logo);
 }