Stop using ResourceController in ResourceThrottle

chrome/browser/prerender/prerender_resource_throttle_unittest.cc

 // Copyright (c) 2012 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 <set>
 #include <utility>
 
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "chrome/browser/net/url_request_mock_util.h"
 #include "chrome/browser/prerender/prerender_contents.h"
 #include "chrome/browser/prerender/prerender_manager.h"
 #include "chrome/browser/prerender/prerender_resource_throttle.h"
 #include "chrome/test/base/testing_browser_process.h"
-#include "content/public/browser/resource_controller.h"
 #include "content/public/browser/resource_request_info.h"
+#include "content/public/browser/resource_throttle.h"
 #include "content/public/test/test_browser_thread.h"
 #include "ipc/ipc_message.h"
 #include "net/base/request_priority.h"
 #include "net/test/url_request/url_request_mock_http_job.h"
 #include "net/url_request/redirect_info.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using content::BrowserThread;
@@ skipping 53 matching lines @@
     mutable_config().rate_limit_enabled = false;
   }
 
   // We never allocate our PrerenderContents in PrerenderManager, so we don't
   // ever want the default pending delete behaviour.
   void MoveEntryToPendingDelete(PrerenderContents* entry,
                                 FinalStatus final_status) override {}
 };
 
 class DeferredRedirectDelegate : public net::URLRequest::Delegate,
-                                 public content::ResourceController {
+                                 public content::ResourceThrottle::Delegate {
  public:
   DeferredRedirectDelegate()
       : throttle_(NULL),
         was_deferred_(false),
         cancel_called_(false),
         resume_called_(false) {
   }
 
   void SetThrottle(PrerenderResourceThrottle* throttle) {
     throttle_ = throttle;
-    throttle_->set_controller_for_testing(this);
+    throttle_->set_delegate_for_testing(this);
   }
 
   void Run() {
     run_loop_.reset(new base::RunLoop());
     run_loop_->Run();
   }
 
   bool was_deferred() const { return was_deferred_; }
   bool cancel_called() const { return cancel_called_; }
   bool resume_called() const { return resume_called_; }
 
   // net::URLRequest::Delegate implementation:
   void OnReceivedRedirect(net::URLRequest* request,
                           const net::RedirectInfo& redirect_info,
                           bool* defer_redirect) override {
     // Defer the redirect either way.
     *defer_redirect = true;
 
     // Find out what the throttle would have done.
     throttle_->WillRedirectRequest(redirect_info, &was_deferred_);
     run_loop_->Quit();
   }
   void OnResponseStarted(net::URLRequest* request, int net_error) override {}
   void OnReadCompleted(net::URLRequest* request, int bytes_read) override {}
 
-  // content::ResourceController implementation:
+  // content::ResourceThrottle::Delegate implementation:
   void Cancel() override {
     EXPECT_FALSE(cancel_called_);
     EXPECT_FALSE(resume_called_);
 
     cancel_called_ = true;
     run_loop_->Quit();
   }
   void CancelAndIgnore() override { Cancel(); }
   void CancelWithError(int error_code) override { Cancel(); }
   void Resume() override {
@@ skipping 179 matching lines @@
   // We should have cancelled the prerender.
   EXPECT_EQ(FINAL_STATUS_BAD_DEFERRED_REDIRECT,
             test_contents()->final_status());
 
   // Cleanup work so the prerender is gone.
   test_contents()->Cancel();
   RunEvents();
 }
 
 }  // namespace prerender