Create a content::UrlFetcher interface that lives in content/public/common and convert users to it. I have added a static create function, but will switch instantiations to use it in another change since this has grown a lot. Basically this change converts function names away from unix_hacker style, which they shouldn't have been using anyways since some are virtual, and made all of the other functions virtual.

BUG=98716
Review URL: http://codereview.chromium.org/8375039

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107151 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 13 insertions, 12 deletions

diff --git a/content/browser/speech/speech_recognition_request.cc b/content/browser/speech/speech_recognition_request.cc
index e204b10..e04b490 100644
--- a/content/browser/speech/speech_recognition_request.cc
+++ b/content/browser/speech/speech_recognition_request.cc
@@ -186,15 +186,15 @@ void SpeechRecognitionRequest::Start(const std::string& language,
                                         url,
                                         URLFetcher::POST,
                                         this));
-  url_fetcher_->set_chunked_upload(content_type);
-  url_fetcher_->set_request_context(url_context_);
-  url_fetcher_->set_referrer(origin_url);
+  url_fetcher_->SetChunkedUpload(content_type);
+  url_fetcher_->SetRequestContext(url_context_);
+  url_fetcher_->SetReferrer(origin_url);
 
   // The speech recognition API does not require user identification as part
   // of requests, so we don't send cookies or auth data for these requests to
   // prevent any accidental connection between users who are logged into the
   // domain for other services (e.g. bookmark sync) with the speech requests.
-  url_fetcher_->set_load_flags(
+  url_fetcher_->SetLoadFlags(
       net::LOAD_DO_NOT_SAVE_COOKIES | net::LOAD_DO_NOT_SEND_COOKIES |
       net::LOAD_DO_NOT_SEND_AUTH_DATA);
   url_fetcher_->Start();
@@ -206,12 +206,13 @@ void SpeechRecognitionRequest::UploadAudioChunk(const std::string& audio_data,
   url_fetcher_->AppendChunkToUpload(audio_data, is_last_chunk);
 }
 
-void SpeechRecognitionRequest::OnURLFetchComplete(const URLFetcher* source) {
+void SpeechRecognitionRequest::OnURLFetchComplete(
+    const content::URLFetcher* source) {
   DCHECK_EQ(url_fetcher_.get(), source);
 
   SpeechInputResult result;
   std::string data;
-  if (!source->status().is_success() || source->response_code() != 200 ||
+  if (!source->GetStatus().is_success() || source->GetResponseCode() != 200 ||
       !source->GetResponseAsString(&data) ||
       !ParseServerResponse(data, &result)) {
     result.error = kErrorNetwork;
diff --git a/content/browser/speech/speech_recognition_request.h b/content/browser/speech/speech_recognition_request.h
index caab120..638b92c 100644
--- a/content/browser/speech/speech_recognition_request.h
+++ b/content/browser/speech/speech_recognition_request.h
@@ -63,12 +63,12 @@ class SpeechRecognitionRequest : public content::URLFetcherDelegate {
   CONTENT_EXPORT bool HasPendingRequest() { return url_fetcher_ != NULL; }
 
   // content::URLFetcherDelegate methods.
-  virtual void OnURLFetchComplete(const URLFetcher* source) OVERRIDE;
+  virtual void OnURLFetchComplete(const content::URLFetcher* source) OVERRIDE;
 
  private:
   scoped_refptr<net::URLRequestContextGetter> url_context_;
   Delegate* delegate_;
-  scoped_ptr<URLFetcher> url_fetcher_;
+  scoped_ptr<content::URLFetcher> url_fetcher_;
 
   DISALLOW_COPY_AND_ASSIGN(SpeechRecognitionRequest);
 };
diff --git a/content/browser/speech/speech_recognition_request_unittest.cc b/content/browser/speech/speech_recognition_request_unittest.cc
index 53c80dc..d43d4d3 100644
--- a/content/browser/speech/speech_recognition_request_unittest.cc
+++ b/content/browser/speech/speech_recognition_request_unittest.cc
@@ -40,7 +40,7 @@ void SpeechRecognitionRequestTest::CreateAndTestRequest(
   TestURLFetcher* fetcher = url_fetcher_factory_.GetFetcherByID(0);
   ASSERT_TRUE(fetcher);
 
-  fetcher->set_url(fetcher->original_url());
+  fetcher->set_url(fetcher->GetOriginalUrl());
   net::URLRequestStatus status;
   status.set_status(success ? net::URLRequestStatus::SUCCESS :
                               net::URLRequestStatus::FAILED);
diff --git a/content/browser/speech/speech_recognizer_unittest.cc b/content/browser/speech/speech_recognizer_unittest.cc
index 0be64eb..25bbe22 100644
--- a/content/browser/speech/speech_recognizer_unittest.cc
+++ b/content/browser/speech/speech_recognizer_unittest.cc
@@ -176,7 +176,7 @@ TEST_F(SpeechRecognizerTest, StopWithData) {
   TestURLFetcher* fetcher = url_fetcher_factory_.GetFetcherByID(0);
   ASSERT_TRUE(fetcher);
 
-  fetcher->set_url(fetcher->original_url());
+  fetcher->set_url(fetcher->GetOriginalUrl());
   net::URLRequestStatus status;
   status.set_status(net::URLRequestStatus::SUCCESS);
   fetcher->set_status(status);
@@ -230,7 +230,7 @@ TEST_F(SpeechRecognizerTest, ConnectionError) {
   EXPECT_EQ(kErrorNone, error_);
 
   // Issue the network callback to complete the process.
-  fetcher->set_url(fetcher->original_url());
+  fetcher->set_url(fetcher->GetOriginalUrl());
   net::URLRequestStatus status;
   status.set_status(net::URLRequestStatus::FAILED);
   status.set_error(net::ERR_CONNECTION_REFUSED);
@@ -265,7 +265,7 @@ TEST_F(SpeechRecognizerTest, ServerError) {
   EXPECT_EQ(kErrorNone, error_);
 
   // Issue the network callback to complete the process.
-  fetcher->set_url(fetcher->original_url());
+  fetcher->set_url(fetcher->GetOriginalUrl());
   net::URLRequestStatus status;
   status.set_status(net::URLRequestStatus::SUCCESS);
   fetcher->set_status(status);