Move URL fixup to a preliminary phase that doesn't affect virtual URLs.

content/browser/browser_url_handler_impl.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 "content/browser/browser_url_handler_impl.h"
 
 #include "base/strings/string_util.h"
 #include "content/browser/frame_host/debug_urls.h"
 #include "content/browser/webui/web_ui_impl.h"
 #include "content/public/browser/content_browser_client.h"
@@ skipping 70 matching lines @@
 BrowserURLHandler::URLHandler BrowserURLHandler::null_handler() {
   // Required for VS2010: http://connect.microsoft.com/VisualStudio/feedback/details/520043/error-converting-from-null-to-a-pointer-type-in-std-pair
   return NULL;
 }
 
 // static
 BrowserURLHandlerImpl* BrowserURLHandlerImpl::GetInstance() {
   return Singleton<BrowserURLHandlerImpl>::get();
 }
 
-BrowserURLHandlerImpl::BrowserURLHandlerImpl() {
+BrowserURLHandlerImpl::BrowserURLHandlerImpl() :
+    fixup_handler_(null_handler()) {
   AddHandlerPair(&DebugURLHandler, BrowserURLHandlerImpl::null_handler());
 
   GetContentClient()->browser()->BrowserURLHandlerCreated(this);
 
   // view-source:
   AddHandlerPair(&HandleViewSource, &ReverseViewSource);
 }
 
 BrowserURLHandlerImpl::~BrowserURLHandlerImpl() {
 }
 
+void BrowserURLHandlerImpl::SetFixupHandler(URLHandler handler) {
+  DCHECK_EQ(null_handler(), fixup_handler_);
+  fixup_handler_ = handler;
+}
+
 void BrowserURLHandlerImpl::AddHandlerPair(URLHandler handler,
                                            URLHandler reverse_handler) {
   url_handlers_.push_back(HandlerPair(handler, reverse_handler));
 }
 
 void BrowserURLHandlerImpl::RewriteURLIfNecessary(
     GURL* url,
     BrowserContext* browser_context,
     bool* reverse_on_redirect) {
   for (size_t i = 0; i < url_handlers_.size(); ++i) {
     URLHandler handler = *url_handlers_[i].first;
     if (handler && handler(url, browser_context)) {
       *reverse_on_redirect = (url_handlers_[i].second != NULL);
       return;
     }
   }
 }
 
+void BrowserURLHandlerImpl::FixupURLBeforeRewrite(
+    GURL* url,
+    BrowserContext* browser_context) {
+  if (fixup_handler_)
+    fixup_handler_(url, browser_context);
+}
+
 bool BrowserURLHandlerImpl::ReverseURLRewrite(
     GURL* url, const GURL& original, BrowserContext* browser_context) {
   for (size_t i = 0; i < url_handlers_.size(); ++i) {
     URLHandler reverse_rewriter = *url_handlers_[i].second;
     if (reverse_rewriter) {
       GURL test_url(original);
       URLHandler handler = *url_handlers_[i].first;
       if (!handler) {
         if (reverse_rewriter(url, browser_context))
           return true;
       } else if (handler(&test_url, browser_context)) {
         return reverse_rewriter(url, browser_context);
       }
     }
   }
   return false;
 }
 
 }  // namespace content