Adds RequestContextType information to the NavigationHandle.

content/browser/frame_host/navigation_handle_impl.cc

 // Copyright 2015 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/frame_host/navigation_handle_impl.h"
 
 #include <utility>
 
 #include "base/logging.h"
 #include "content/browser/devtools/render_frame_devtools_agent_host.h"
@@ skipping 54 matching lines @@
       is_renderer_initiated_(is_renderer_initiated),
       is_same_page_(false),
       is_synchronous_(is_synchronous),
       is_srcdoc_(is_srcdoc),
       was_redirected_(false),
       state_(INITIAL),
       is_transferring_(false),
       frame_tree_node_(frame_tree_node),
       next_index_(0),
       navigation_start_(navigation_start),
-      pending_nav_entry_id_(pending_nav_entry_id) {
+      pending_nav_entry_id_(pending_nav_entry_id),
+      request_context_type_(REQUEST_CONTEXT_TYPE_UNSPECIFIED) {
   DCHECK(!navigation_start.is_null());
   GetDelegate()->DidStartNavigation(this);
 
   if (IsInMainFrame()) {
     TRACE_EVENT_ASYNC_BEGIN_WITH_TIMESTAMP1(
         "navigation", "Navigation StartToCommit", this,
         navigation_start.ToInternalValue(), "Initial URL", url_.spec());
   }
 }
 
 NavigationHandleImpl::~NavigationHandleImpl() {
   GetDelegate()->DidFinishNavigation(this);
 
   // Cancel the navigation on the IO thread if the NavigationHandle is being
   // destroyed in the middle of the NavigationThrottles checks.
   if (!IsBrowserSideNavigationEnabled() && !complete_callback_.is_null())
     RunCompleteCallback(NavigationThrottle::CANCEL_AND_IGNORE);
 
   if (IsInMainFrame()) {
     TRACE_EVENT_ASYNC_END2("navigation", "Navigation StartToCommit", this,
                            "URL", url_.spec(), "Net Error Code",
                            net_error_code_);
   }
 }
 
 NavigatorDelegate* NavigationHandleImpl::GetDelegate() const {
   return frame_tree_node_->navigator()->GetDelegate();
 }
 
+RequestContextType NavigationHandleImpl::GetFetchRequestContextType() const {
+  CHECK_GE(state_, WILL_SEND_REQUEST);

[clamy, 2016/07/22 13:51:31]

DCHECK.

[carlosk, 2016/07/22 16:00:29]

Done.

+  return request_context_type_;
+}
+
 const GURL& NavigationHandleImpl::GetURL() {
   return url_;
 }
 
 bool NavigationHandleImpl::IsInMainFrame() {
   return frame_tree_node_->IsMainFrame();
 }
 
 bool NavigationHandleImpl::IsParentMainFrame() {
   if (frame_tree_node_->parent())
@@ skipping 148 matching lines @@
   if (is_post) {
     method = "POST";
 
     std::string body = "test=body";
     resource_request_body = new ResourceRequestBodyImpl();
     resource_request_body->AppendBytes(body.data(), body.size());
   }
 
   WillStartRequest(method, resource_request_body, sanitized_referrer,
                    has_user_gesture, transition, is_external_protocol,
+                   REQUEST_CONTEXT_TYPE_LOCATION,
                    base::Bind(&UpdateThrottleCheckResult, &result));
 
   // Reset the callback to ensure it will not be called later.
   complete_callback_.Reset();
   return result;
 }
 
 NavigationThrottle::ThrottleCheckResult
 NavigationHandleImpl::CallWillRedirectRequestForTesting(
     const GURL& new_url,
@@ skipping 15 matching lines @@
   return navigation_data_.get();
 }
 
 void NavigationHandleImpl::WillStartRequest(
     const std::string& method,
     scoped_refptr<content::ResourceRequestBodyImpl> resource_request_body,
     const Referrer& sanitized_referrer,
     bool has_user_gesture,
     ui::PageTransition transition,
     bool is_external_protocol,
+    RequestContextType request_context_type,
     const ThrottleChecksFinishedCallback& callback) {
   // |method != "POST"| should imply absence of |resource_request_body|.
   if (method != "POST" && resource_request_body) {
     NOTREACHED();
     resource_request_body = nullptr;
   }
 
   // Update the navigation parameters.
   method_ = method;
   if (method_ == "POST")
     resource_request_body_ = resource_request_body;
   sanitized_referrer_ = sanitized_referrer;
   has_user_gesture_ = has_user_gesture;
   transition_ = transition;
   is_external_protocol_ = is_external_protocol;
-
+  request_context_type_ = request_context_type;
   state_ = WILL_SEND_REQUEST;
   complete_callback_ = callback;
 
   RegisterNavigationThrottles();
 
   // Notify each throttle of the request.
   NavigationThrottle::ThrottleCheckResult result = CheckWillStartRequest();
 
   // If the navigation is not deferred, run the callback.
   if (result != NavigationThrottle::DEFER)
@@ skipping 202 matching lines @@
                       throttles_to_register.end());
     throttles_to_register.weak_clear();
   }
   std::unique_ptr<NavigationThrottle> devtools_throttle =
       RenderFrameDevToolsAgentHost::CreateThrottleForNavigation(this);
   if (devtools_throttle)
     throttles_.push_back(devtools_throttle.release());
 }
 
 }  // namespace content