Fix tab restore for view-source Chrome extension pages.

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 <stddef.h>
 
 #include "base/macros.h"
 #include "base/strings/string_util.h"
@@ skipping 17 matching lines @@
         url::kHttpScheme,
         url::kHttpsScheme,
         url::kFtpScheme,
         kChromeDevToolsScheme,
         kChromeUIScheme,
         url::kFileScheme,
         url::kFileSystemScheme
     };
 
     // Merge all the schemes for which view-source is allowed by default, with
-    // the WebUI schemes defined by the ContentBrowserClient.
+    // the view-source schemes defined by the ContentBrowserClient.
     std::vector<std::string> all_allowed_sub_schemes;
     for (size_t i = 0; i < arraysize(default_allowed_sub_schemes); ++i)
       all_allowed_sub_schemes.push_back(default_allowed_sub_schemes[i]);
-    GetContentClient()->browser()->GetAdditionalWebUISchemes(
+    GetContentClient()->browser()->GetAdditionalViewSourceSchemes(
         &all_allowed_sub_schemes);
 
     bool is_sub_scheme_allowed = false;
     for (size_t i = 0; i < all_allowed_sub_schemes.size(); ++i) {
       if (url->SchemeIs(all_allowed_sub_schemes[i].c_str())) {
         is_sub_scheme_allowed = true;
         break;
       }
     }
 
@@ skipping 35 matching lines @@
 
 // static
 BrowserURLHandlerImpl* BrowserURLHandlerImpl::GetInstance() {
   return base::Singleton<BrowserURLHandlerImpl>::get();
 }
 
 BrowserURLHandlerImpl::BrowserURLHandlerImpl() :
     fixup_handler_(nullptr) {
   AddHandlerPair(&DebugURLHandler, BrowserURLHandlerImpl::null_handler());
 
+  // view-source: should take precedence over other rewriters, so it's
+  // important to add it before calling up to the content client.
+  AddHandlerPair(&HandleViewSource, &ReverseViewSource);
+
   GetContentClient()->browser()->BrowserURLHandlerCreated(this);
-
-  // view-source:
-  AddHandlerPair(&HandleViewSource, &ReverseViewSource);
 }
 
 BrowserURLHandlerImpl::~BrowserURLHandlerImpl() {
 }
 
 void BrowserURLHandlerImpl::SetFixupHandler(URLHandler handler) {
   DCHECK(fixup_handler_ == nullptr);
   fixup_handler_ = handler;
 }
 
@@ skipping 34 matching lines @@
           return true;
       } else if (handler(&test_url, browser_context)) {
         return reverse_rewriter(url, browser_context);
       }
     }
   }
   return false;
 }
 
 }  // namespace content