Stop using ResourceController in ResourceThrottle

chrome/browser/extensions/user_script_listener.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 "chrome/browser/extensions/user_script_listener.h"
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/timer/elapsed_timer.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/extensions/manifest_handlers/content_scripts_handler.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
-#include "content/public/browser/resource_controller.h"
 #include "content/public/browser/resource_throttle.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/url_pattern.h"
 #include "net/url_request/url_request.h"
 
 using content::BrowserThread;
 using content::ResourceThrottle;
 using content::ResourceType;
 
 namespace extensions {
 
 class UserScriptListener::Throttle
     : public ResourceThrottle,
       public base::SupportsWeakPtr<UserScriptListener::Throttle> {
  public:
   Throttle() : should_defer_(true), did_defer_(false) {
   }
 
-  void Resume() {
+  void ResumeIfDeferred() {
     DCHECK(should_defer_);
     should_defer_ = false;
     // Only resume the request if |this| has deferred it.
     if (did_defer_) {
       UMA_HISTOGRAM_TIMES("Extensions.ThrottledNetworkRequestDelay",
                           timer_->Elapsed());
-      controller()->Resume();
+      Resume();
     }
   }
 
   // ResourceThrottle implementation:
   void WillStartRequest(bool* defer) override {
     // Only defer requests if Resume has not yet been called.
     if (should_defer_) {
       *defer = true;
       did_defer_ = true;
       timer_.reset(new base::ElapsedTimer());
@@ skipping 85 matching lines @@
 
   return false;
 }
 
 void UserScriptListener::StartDelayedRequests() {
   UMA_HISTOGRAM_COUNTS_100("Extensions.ThrottledNetworkRequests",
                            throttles_.size());
   WeakThrottleList::const_iterator it;
   for (it = throttles_.begin(); it != throttles_.end(); ++it) {
     if (it->get())
-      (*it)->Resume();
+      (*it)->ResumeIfDeferred();
   }
   throttles_.clear();
 }
 
 void UserScriptListener::CheckIfAllUserScriptsReady() {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   bool was_ready = user_scripts_ready_;
 
   user_scripts_ready_ = true;
   for (ProfileDataMap::const_iterator it = profile_data_.begin();
@@ skipping 111 matching lines @@
           &UserScriptListener::ProfileDestroyed, this, profile));
       break;
     }
 
     default:
       NOTREACHED();
   }
 }
 
 }  // namespace extensions