Create a content::UrlFetcher interface that lives in content/public/common and convert users to i...

chrome/browser/translate/translate_manager.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/translate/translate_manager.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/json/json_reader.h"
@@ skipping 341 matching lines @@
              prefs::kAcceptLanguages);
       PrefService* prefs = content::Source<PrefService>(source).ptr();
       InitAcceptLanguages(prefs);
       break;
     }
     default:
       NOTREACHED();
   }
 }
 
-void TranslateManager::OnURLFetchComplete(const URLFetcher* source) {
+void TranslateManager::OnURLFetchComplete(const content::URLFetcher* source) {
   if (translate_script_request_pending_.get() != source &&
       language_list_request_pending_.get() != source) {
     // Looks like crash on Mac is possibly caused with callback entering here
     // with unknown fetcher when network is refreshed.
-    scoped_ptr<const URLFetcher> delete_ptr(source);
+    scoped_ptr<const content::URLFetcher> delete_ptr(source);
     return;
   }
 
-  bool error = (source->status().status() != net::URLRequestStatus::SUCCESS ||
-                source->response_code() != 200);
+  bool error =
+      (source->GetStatus().status() != net::URLRequestStatus::SUCCESS ||
+      source->GetResponseCode() != 200);
   if (translate_script_request_pending_.get() == source) {
-    scoped_ptr<const URLFetcher> delete_ptr(
+    scoped_ptr<const content::URLFetcher> delete_ptr(
         translate_script_request_pending_.release());
     if (!error) {
       base::StringPiece str = ResourceBundle::GetSharedInstance().
           GetRawDataResource(IDR_TRANSLATE_JS);
       DCHECK(translate_script_.empty());
       str.CopyToString(&translate_script_);
       std::string data;
       source->GetResponseAsString(&data);
       translate_script_ += "\n" + data;
       // We'll expire the cached script after some time, to make sure long
@@ skipping 33 matching lines @@
                 request.source_lang,
                 request.target_lang));
       } else {
         // Translate the page.
         DoTranslatePage(tab, translate_script_,
                         request.source_lang, request.target_lang);
       }
     }
     pending_requests_.clear();
   } else {  // if (translate_script_request_pending_.get() == source)
-    scoped_ptr<const URLFetcher> delete_ptr(
+    scoped_ptr<const content::URLFetcher> delete_ptr(
         language_list_request_pending_.release());
     if (!error) {
       std::string data;
       source->GetResponseAsString(&data);
       SetSupportedLanguages(data);
     } else {
       VLOG(1) << "Failed to Fetch languages from: " << kLanguageListFetchURL;
     }
   }
 }
@@ skipping 312 matching lines @@
   // We don't want to do this when translate is disabled.
   DCHECK(prefs != NULL);
   if (CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kDisableTranslate) ||
       (prefs != NULL && !prefs->GetBoolean(prefs::kEnableTranslate))) {
     return;
   }
 
   language_list_request_pending_.reset(URLFetcher::Create(
       1, GURL(kLanguageListFetchURL), URLFetcher::GET, this));
-  language_list_request_pending_->set_request_context(
+  language_list_request_pending_->SetRequestContext(
       Profile::Deprecated::GetDefaultRequestContext());
-  language_list_request_pending_->set_max_retries(kMaxRetryLanguageListFetch);
+  language_list_request_pending_->SetMaxRetries(kMaxRetryLanguageListFetch);
   language_list_request_pending_->Start();
 }
 
 void TranslateManager::CleanupPendingUlrFetcher() {
   language_list_request_pending_.reset();
   translate_script_request_pending_.reset();
 }
 
 void TranslateManager::RequestTranslateScript() {
   if (translate_script_request_pending_.get() != NULL)
     return;
 
   translate_script_request_pending_.reset(URLFetcher::Create(
       0, GURL(kTranslateScriptURL), URLFetcher::GET, this));
-  translate_script_request_pending_->set_request_context(
+  translate_script_request_pending_->SetRequestContext(
       Profile::Deprecated::GetDefaultRequestContext());
-  translate_script_request_pending_->set_extra_request_headers(
+  translate_script_request_pending_->SetExtraRequestHeaders(
       kTranslateScriptHeader);
   translate_script_request_pending_->Start();
 }
 
 void TranslateManager::ShowInfoBar(TabContents* tab,
                                    TranslateInfoBarDelegate* infobar) {
   DCHECK(infobar != NULL);
   TranslateInfoBarDelegate* old_infobar = GetTranslateInfoBarDelegate(tab);
   infobar->UpdateBackgroundAnimation(old_infobar);
   TabContentsWrapper* wrapper =
@@ skipping 44 matching lines @@
   InfoBarTabHelper* infobar_helper = wrapper->infobar_tab_helper();
 
   for (size_t i = 0; i < infobar_helper->infobar_count(); ++i) {
     TranslateInfoBarDelegate* delegate =
         infobar_helper->GetInfoBarDelegateAt(i)->AsTranslateInfoBarDelegate();
     if (delegate)
       return delegate;
   }
   return NULL;
 }