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

chrome/browser/policy/testing_policy_url_fetcher_factory.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/policy/testing_policy_url_fetcher_factory.h"
 
 #include "base/bind.h"
 #include "chrome/browser/policy/logging_work_scheduler.h"
 #include "googleurl/src/gurl.h"
 #include "googleurl/src/url_parse.h"
@@ skipping 22 matching lines @@
 
 namespace policy {
 
 // An URLFetcher that calls back to its factory to figure out what to respond.
 class TestingPolicyURLFetcher : public URLFetcher {
  public:
   TestingPolicyURLFetcher(
       const base::WeakPtr<TestingPolicyURLFetcherFactory>& parent,
       const GURL& url,
       URLFetcher::RequestType request_type,
-      URLFetcher::Delegate* delegate);
+      content::URLFetcherDelegate* delegate);
 
   virtual void Start() OVERRIDE;
   void Respond();
 
+  virtual const GURL& url() const {
+    return url_;
+  }
+
+  virtual const net::URLRequestStatus& status() const {
+    return status_;
+  }
+
+  virtual int response_code() const {
+    return response_.response_code;
+  }
+
+  virtual bool GetResponseAsString(std::string* out_response_string) const {
+    *out_response_string = response_.response_data;
+    return true;
+  }
+
  private:
   GURL url_;
+  net::URLRequestStatus status_;
   TestURLResponse response_;
   base::WeakPtr<TestingPolicyURLFetcherFactory> parent_;
 
   DISALLOW_COPY_AND_ASSIGN(TestingPolicyURLFetcher);
 };
 
 TestingPolicyURLFetcher::TestingPolicyURLFetcher(
     const base::WeakPtr<TestingPolicyURLFetcherFactory>& parent,
     const GURL& url,
     URLFetcher::RequestType request_type,
-    URLFetcher::Delegate* delegate)
+    content::URLFetcherDelegate* delegate)
         : URLFetcher(url, request_type, delegate),
           url_(url),
+          status_(net::URLRequestStatus::SUCCESS, 0),
           parent_(parent) {
 }
 
 void TestingPolicyURLFetcher::Start() {
   if (!parent_.get()) return;
 
   std::string auth_header;
   net::HttpRequestHeaders headers;
   std::string request = GetRequestType(url_);
   GetExtraRequestHeaders(&headers);
   headers.GetHeader("Authorization", &auth_header);
   // The following method is mocked by the currently running test.
   parent_->GetResponse(auth_header, request, &response_);
 
   // We need to channel this through the central event logger, so that ordering
   // with other logged tasks that have a delay is preserved.
   parent_->scheduler()->PostDelayedWork(
       base::Bind(&TestingPolicyURLFetcher::Respond, base::Unretained(this)),
       0);
 }
 
 void TestingPolicyURLFetcher::Respond() {
-  delegate()->OnURLFetchComplete(
-      this,
-      url_,
-      net::URLRequestStatus(net::URLRequestStatus::SUCCESS, 0),
-      response_.response_code,
-      net::ResponseCookies(),
-      response_.response_data);
+  delegate()->OnURLFetchComplete(this);
 }
 
 TestingPolicyURLFetcherFactory::TestingPolicyURLFetcherFactory(
     EventLogger* logger)
     : ScopedURLFetcherFactory(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
       logger_(logger),
       scheduler_(new LoggingWorkScheduler(logger)),
       ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) {
 }
 
 TestingPolicyURLFetcherFactory::~TestingPolicyURLFetcherFactory() {
 }
 
 LoggingWorkScheduler* TestingPolicyURLFetcherFactory::scheduler() {
   return scheduler_.get();
 }
 
 void TestingPolicyURLFetcherFactory::GetResponse(
     const std::string& auth_header,
     const std::string& request,
     TestURLResponse* response) {
   logger_->RegisterEvent();
   Intercept(auth_header, request, response);
 }
 
 URLFetcher* TestingPolicyURLFetcherFactory::CreateURLFetcher(
     int id,
     const GURL& url,
     URLFetcher::RequestType request_type,
-    URLFetcher::Delegate* delegate) {
+    content::URLFetcherDelegate* delegate) {
   return new TestingPolicyURLFetcher(
       weak_ptr_factory_.GetWeakPtr(), url, request_type, delegate);
 }
 
 }  // namespace policy