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

content/browser/speech/speech_recognition_request.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.
 
 #ifndef CONTENT_BROWSER_SPEECH_SPEECH_RECOGNITION_REQUEST_H_
 #define CONTENT_BROWSER_SPEECH_SPEECH_RECOGNITION_REQUEST_H_
 #pragma once
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/common/content_export.h"
-#include "content/common/net/url_fetcher.h"
+#include "content/public/common/url_fetcher_delegate.h"
 #include "content/common/speech_input_result.h"
 #include "googleurl/src/gurl.h"
 
 class URLFetcher;
 
 namespace net {
 class URLRequestContextGetter;
 }
 
 namespace speech_input {
 
 // Provides a simple interface for sending recorded speech data to the server
 // and get back recognition results.
-class SpeechRecognitionRequest : public URLFetcher::Delegate {
+class SpeechRecognitionRequest : public content::URLFetcherDelegate {
  public:
   // ID passed to URLFetcher::Create(). Used for testing.
   CONTENT_EXPORT static int url_fetcher_id_for_tests;
 
   // Interface for receiving callbacks from this object.
   class CONTENT_EXPORT Delegate {
    public:
     virtual void SetRecognitionResult(const SpeechInputResult& result) = 0;
 
    protected:
@@ skipping 15 matching lines @@
                             const std::string& hardware_info,
                             const std::string& origin_url,
                             const std::string& content_type);
 
   // Send a single chunk of audio immediately to the server.
   CONTENT_EXPORT void UploadAudioChunk(const std::string& audio_data,
                                        bool is_last_chunk);
 
   CONTENT_EXPORT bool HasPendingRequest() { return url_fetcher_ != NULL; }
 
-  // URLFetcher::Delegate methods.
+  // content::URLFetcherDelegate methods.
   virtual void OnURLFetchComplete(const URLFetcher* source) OVERRIDE;
 
  private:
   scoped_refptr<net::URLRequestContextGetter> url_context_;
   Delegate* delegate_;
   scoped_ptr<URLFetcher> url_fetcher_;
 
   DISALLOW_COPY_AND_ASSIGN(SpeechRecognitionRequest);
 };
 
 // This typedef is to workaround the issue with certain versions of
 // Visual Studio where it gets confused between multiple Delegate
 // classes and gives a C2500 error. (I saw this error on the try bots -
 // the workaround was not needed for my machine).
 typedef SpeechRecognitionRequest::Delegate SpeechRecognitionRequestDelegate;
 
 }  // namespace speech_input
 
 #endif  // CONTENT_BROWSER_SPEECH_SPEECH_RECOGNITION_REQUEST_H_