Stop using ResourceController in ResourceThrottle

content/browser/loader/cross_site_resource_handler_browsertest.cc

 // Copyright 2015 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 "base/callback.h"
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "content/browser/frame_host/render_frame_host_impl.h"
 #include "content/browser/loader/resource_dispatcher_host_impl.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/common/frame_messages.h"
-#include "content/public/browser/resource_controller.h"
 #include "content/public/browser/resource_dispatcher_host.h"
 #include "content/public/browser/resource_dispatcher_host_delegate.h"
 #include "content/public/browser/resource_throttle.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/content_browser_test.h"
 #include "content/public/test/content_browser_test_utils.h"
 #include "content/public/test/test_utils.h"
 #include "content/shell/browser/shell.h"
 #include "content/shell/browser/shell_resource_dispatcher_host_delegate.h"
@@ skipping 75 matching lines @@
         : resumed_(false),
           request_(request),
           tracker_(tracker),
           run_on_start_(run_on_start),
           weak_factory_(this) {}
 
     void WillStartRequest(bool* defer) override {
       *defer = true;
       base::Closure resume_request_on_io_thread = base::Bind(
           base::IgnoreResult(&BrowserThread::PostTask), BrowserThread::IO,
-          FROM_HERE, base::Bind(&CallbackRunningResourceThrottle::Resume,
+          FROM_HERE, base::Bind(&CallbackRunningResourceThrottle::MarkAndResume,
                                 weak_factory_.GetWeakPtr()));
       BrowserThread::PostTask(
           BrowserThread::UI, FROM_HERE,
           base::Bind(run_on_start_, resume_request_on_io_thread));
     }
 
     ~CallbackRunningResourceThrottle() override {
       // If the request is deleted without being cancelled, its status will
       // indicate it succeeded, so have to check if the request is still pending
       // as well. If the request never even started, the throttle will never
       // resume it. Check this condition as well to allow for early
       // cancellation.
       tracker_->OnTrackedRequestDestroyed(!request_->is_pending() &&
                                           request_->status().is_success() &&
                                           resumed_);
     }
 
     // ResourceThrottle implementation:
     const char* GetNameForLogging() const override {
       return "CallbackRunningResourceThrottle";
     }
 
    private:
-    void Resume() {
+    void MarkAndResume() {
       resumed_ = true;
-      controller()->Resume();
+      Resume();
     }
 
     bool resumed_;
     net::URLRequest* request_;
     TestResourceDispatcherHostDelegate* tracker_;
     RequestDeferredHook run_on_start_;
     base::WeakPtrFactory<CallbackRunningResourceThrottle> weak_factory_;
 
     DISALLOW_COPY_AND_ASSIGN(CallbackRunningResourceThrottle);
   };
@@ skipping 131 matching lines @@
       base::StringPrintf("document.getElementById('child-0').src='%s'",
                          target_resource.spec().c_str())));
 
   // Wait for the scenario to play out. If this returns false, it means the
   // request did not succeed, which is good in this case.
   EXPECT_FALSE(tracking_delegate().WaitForTrackedURLAndGetCompleted())
       << "Request should have been cancelled before reaching the renderer.";
 }
 
 }  // namespace content