Move navigations with POST or referrer to the shell.

components/html_viewer/html_document.cc

 // Copyright 2014 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 "components/html_viewer/html_document.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop_proxy.h"
@@ skipping 28 matching lines @@
 #include "third_party/WebKit/public/web/WebScriptSource.h"
 #include "third_party/WebKit/public/web/WebSettings.h"
 #include "third_party/WebKit/public/web/WebView.h"
 #include "third_party/mojo/src/mojo/public/cpp/system/data_pipe.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkDevice.h"
 #include "ui/gfx/geometry/dip_util.h"
 #include "ui/gfx/geometry/size.h"
 
+using blink::WebString;
 using mojo::AxProvider;
 using mojo::Rect;
 using mojo::ServiceProviderPtr;
 using mojo::URLResponsePtr;
 using mojo::View;
 using mojo::ViewManager;
 using mojo::WeakBindToRequest;
 
 namespace html_viewer {
 namespace {
@@ skipping 28 matching lines @@
   // different instance of Blink if the frame is cross-origin.
   if (frame->parent())
     return true;
 
   // If we have extraData() it means we already have the url response
   // (presumably because we are being called via Navigate()). In that case we
   // can go ahead and navigate locally.
   if (request.extraData())
     return true;
 
-  // mojo::NavigatorHost doesn't accept POSTs, so for now reuse this instance.
-  // TODO(jam): improve this (and copy logic from RenderFrameImpl's version)
-  // when we have multi-process.
-  if (EqualsASCII(request.httpMethod(), "POST"))
-    return true;
-
-  // Logging into Gmail fails when the referrer isn't sent with a request.
-  // TODO(jam): pass referrer and other HTTP data to NavigatorHost so we can
-  // use a new process in this case.
-  if (!request.httpHeaderField(blink::WebString::fromUTF8("Referer")).isEmpty())
-    return true;
-
   // Otherwise we don't know if we're the right app to handle this request. Ask
   // host to do the navigation for us.
   return false;
 }
 
 bool AreSecureCodecsSupported() {
   // Hardware-secure codecs are not currently supported by HTML Viewer on any
   // platform.
   return false;
 }
@@ skipping 108 matching lines @@
 }
 
 void HTMLDocument::initializeLayerTreeView() {
   if (setup_->is_headless()) {
     web_layer_tree_view_impl_.reset(new WebLayerTreeViewImpl(
         setup_->compositor_thread(), nullptr, nullptr));
     return;
   }
 
   ServiceProviderPtr surfaces_service_provider;
-  shell_->ConnectToApplication("mojo:surfaces_service",
+  mojo::URLRequestPtr request(mojo::URLRequest::New());
+  request->url = mojo::String::From("mojo:surfaces_service");
+  shell_->ConnectToApplication(request.Pass(),
                                GetProxy(&surfaces_service_provider), nullptr);
   mojo::SurfacePtr surface;
   ConnectToService(surfaces_service_provider.get(), &surface);
 
   ServiceProviderPtr gpu_service_provider;
   // TODO(jamesr): Should be mojo:gpu_service
-  shell_->ConnectToApplication("mojo:native_viewport_service",
+  mojo::URLRequestPtr request2(mojo::URLRequest::New());
+  request2->url = mojo::String::From("mojo:native_viewport_service");
+  shell_->ConnectToApplication(request2.Pass(),
                                GetProxy(&gpu_service_provider), nullptr);
   mojo::GpuPtr gpu_service;
   ConnectToService(gpu_service_provider.get(), &gpu_service);
   web_layer_tree_view_impl_.reset(new WebLayerTreeViewImpl(
       setup_->compositor_thread(), surface.Pass(), gpu_service.Pass()));
 }
 
 blink::WebLayerTreeView* HTMLDocument::layerTreeView() {
   return web_layer_tree_view_impl_.get();
 }
@@ skipping 46 matching lines @@
     blink::WebLocalFrame* frame,
     blink::WebDataSource::ExtraData* data,
     const blink::WebURLRequest& request,
     blink::WebNavigationType nav_type,
     blink::WebNavigationPolicy default_policy,
     bool is_redirect) {
   if (CanNavigateLocally(frame, request))
     return default_policy;
 
   if (navigator_host_.get()) {
+    mojo::URLRequestPtr url_request = mojo::URLRequest::From(request);
     navigator_host_->RequestNavigate(
         WebNavigationPolicyToNavigationTarget(default_policy),
-        mojo::URLRequest::From(request).Pass());
+        url_request.Pass());
   }
 
   return blink::WebNavigationPolicyIgnore;
 }
 
 void HTMLDocument::didAddMessageToConsole(
     const blink::WebConsoleMessage& message,
     const blink::WebString& source_name,
     unsigned source_line,
     const blink::WebString& stack_trace) {
@@ skipping 77 matching lines @@
   return media_permission_.get();
 }
 
 media::CdmFactory* HTMLDocument::GetCdmFactory() {
   if (!cdm_factory_)
     cdm_factory_.reset(new media::DefaultCdmFactory());
   return cdm_factory_.get();
 }
 
 }  // namespace html_viewer