Reland of Add a NavigationThrottle to the public content/ interface

chrome/browser/apps/app_url_redirector.h

Index: chrome/browser/apps/app_url_redirector.h
diff --git a/chrome/browser/apps/app_url_redirector.h b/chrome/browser/apps/app_url_redirector.h
index 331d7b421806ce71498f2589d75ef0a3aac43804..629af379f1bf0681656e7499746fde6e6eaf70ea 100644
--- a/chrome/browser/apps/app_url_redirector.h
+++ b/chrome/browser/apps/app_url_redirector.h
@@ -6,24 +6,22 @@
 #define CHROME_BROWSER_APPS_APP_URL_REDIRECTOR_H_
 
 #include "base/basictypes.h"
+#include "base/memory/scoped_ptr.h"
+#include "content/public/browser/navigation_throttle.h"
 
 namespace content {
-class ResourceThrottle;
+class NavigationHandle;
+class NavigationThrottle;
+class WebContents;
 }
 
-namespace net {
-class URLRequest;
-}
-
-class ProfileIOData;
-
-// This class creates resource throttles that redirect URLs to apps that
-// have a matching URL handler in the 'url_handlers' manifest key.
+// This class creates navigation throttles that redirect URLs to apps that have
+// a matching URL handler in the 'url_handlers' manifest key. Note that this is
+// a UI thread class.
 class AppUrlRedirector {
  public:
-  static content::ResourceThrottle* MaybeCreateThrottleFor(
-      net::URLRequest* request,
-      ProfileIOData* profile_io_data);
+  static scoped_ptr<content::NavigationThrottle> MaybeCreateThrottleFor(
+      content::NavigationHandle* handle);
 
  private:
   DISALLOW_COPY_AND_ASSIGN(AppUrlRedirector);