Merge 108571 - Don't reload into an app process.

chrome/renderer/chrome_content_renderer_client.cc

 // Copyright (c) 2011 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/renderer/chrome_content_renderer_client.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 782 matching lines @@
         extension_dispatcher_->is_extension_process() &&
         opener.canRequest(WebURL(new_url)))
       return false;
 
     // In all other cases, we want to compare against the top frame's URL (as
     // opposed to the opener frame's), since that's what determines the type of
     // process.  This allows iframes outside an app to open a popup in the app.
     old_url = frame->top()->opener()->top()->document().url();
   }
 
-  // If this is a reload, check whether it has the wrong process type.  We
-  // should send it to the browser if it's an extension URL (e.g., hosted app)
-  // in a normal process, or if it's a process for an extension that has been
-  // uninstalled.
-  if (old_url == new_url) {
-    if (is_extension_url != extension_dispatcher_->is_extension_process())
-      return true;
-  }
-
   // TODO(creis): Temporary workaround for crbug.com/59285: Only return true if
   // we would enter an extension app's extent from a non-app, or if we leave an
   // extension with no web extent.  We avoid swapping processes to exit a hosted
   // app for now, since we do not yet support postMessage calls from outside the
   // app back into it (e.g., as in Facebook OAuth 2.0).
   bool old_url_is_hosted_app = extensions->GetByURL(old_url) &&
        !extensions->GetByURL(old_url)->web_extent().is_empty();
   return !extensions->InSameExtent(old_url, new_url) &&
          !old_url_is_hosted_app;
 }
@@ skipping 26 matching lines @@
 
 bool ChromeContentRendererClient::IsAdblockPlusWithWebRequestInstalled() {
   return extension_dispatcher_->IsAdblockPlusWithWebRequestInstalled();
 }
 
 bool ChromeContentRendererClient::IsOtherExtensionWithWebRequestInstalled() {
   return extension_dispatcher_->IsOtherExtensionWithWebRequestInstalled();
 }
 
 }  // namespace chrome