Update Effective Connection Type only on main frame requests

content/browser/loader/resource_loader_unittest.cc

 // Copyright (c) 2013 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/loader/resource_loader.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <memory>
@@ skipping 571 matching lines @@
   }
 
   virtual std::unique_ptr<ResourceHandler> WrapResourceHandler(
       std::unique_ptr<ResourceHandlerStub> leaf_handler,
       net::URLRequest* request) {
     return std::move(leaf_handler);
   }
 
   // Replaces loader_ with a new one for |request|.
   void SetUpResourceLoader(std::unique_ptr<net::URLRequest> request,
-                           bool is_main_frame) {
+                           bool is_main_frame_request,
+                           bool belongs_to_main_frame) {
     raw_ptr_to_request_ = request.get();
 
+    // A request marked as a main frame request must also belong to a main
+    // frame.
+    ASSERT_TRUE(!is_main_frame_request || belongs_to_main_frame);
+
     ResourceType resource_type =

[RyanSturm, 2016/08/08 18:13:37]

nit: Would it be better to pass in ResourceType instead of
is_main_frame_request?

[tbansal1, 2016/08/08 18:35:25]

Not sure. May be we can change in future if there is a need to precisely control
the resource type.

[tbansal1, 2016/08/08 18:45:14]

Done.

-        is_main_frame ? RESOURCE_TYPE_MAIN_FRAME : RESOURCE_TYPE_SUB_FRAME;
+        is_main_frame_request ? RESOURCE_TYPE_MAIN_FRAME : RESOURCE_TYPE_OBJECT;

[RyanSturm, 2016/08/08 18:16:45]

#include "content/public/common/resource_type.h"

[tbansal1, 2016/08/08 18:35:25]

Done.

 
     RenderFrameHost* rfh = web_contents_->GetMainFrame();
     ResourceRequestInfo::AllocateForTesting(
         request.get(), resource_type, &resource_context_,
         rfh->GetProcess()->GetID(), rfh->GetRenderViewHost()->GetRoutingID(),
-        rfh->GetRoutingID(), is_main_frame, false /* parent_is_main_frame */,
-        true /* allow_download */, false /* is_async */,
-        false /* is_using_lofi_ */);
+        rfh->GetRoutingID(), belongs_to_main_frame,
+        false /* parent_is_main_frame */, true /* allow_download */,
+        false /* is_async */, false /* is_using_lofi_ */);
     std::unique_ptr<ResourceHandlerStub> resource_handler(
         new ResourceHandlerStub(request.get()));
     raw_ptr_resource_handler_ = resource_handler.get();
     loader_.reset(new ResourceLoader(
         std::move(request),
         WrapResourceHandler(std::move(resource_handler), raw_ptr_to_request_),
         CertStore::GetInstance(), this));
   }
 
   void SetUp() override {
     job_factory_.SetProtocolHandler("test", CreateProtocolHandler());
 
     browser_context_.reset(new TestBrowserContext());
     scoped_refptr<SiteInstance> site_instance =
         SiteInstance::Create(browser_context_.get());
     web_contents_.reset(
         TestWebContents::Create(browser_context_.get(), site_instance.get()));
 
     std::unique_ptr<net::URLRequest> request(
         resource_context_.GetRequestContext()->CreateRequest(
             test_url(), net::DEFAULT_PRIORITY, nullptr /* delegate */));
-    SetUpResourceLoader(std::move(request), true);
+    SetUpResourceLoader(std::move(request), true, true);
   }
 
   void TearDown() override {
     // Destroy the WebContents and pump the event loop before destroying
     // |rvh_test_enabler_| and |thread_bundle_|. This lets asynchronous cleanup
     // tasks complete.
     web_contents_.reset();
     base::RunLoop().RunUntilIdle();
   }
 
@@ skipping 468 matching lines @@
   EXPECT_EQ(test_data(), contents);
 }
 
 // Test that an HTTPS resource has the expected security info attached
 // to it.
 TEST_F(HTTPSSecurityInfoResourceLoaderTest, SecurityInfoOnHTTPSResource) {
   // Start the request and wait for it to finish.
   std::unique_ptr<net::URLRequest> request(
       resource_context_.GetRequestContext()->CreateRequest(
           test_https_url(), net::DEFAULT_PRIORITY, nullptr /* delegate */));
-  SetUpResourceLoader(std::move(request), true);
+  SetUpResourceLoader(std::move(request), true, true);
 
   // Send the request and wait until it completes.
   loader_->StartRequest();
   raw_ptr_resource_handler_->WaitForResponseComplete();
   ASSERT_EQ(net::URLRequestStatus::SUCCESS,
             raw_ptr_to_request_->status().status());
 
   ResourceResponse* response = raw_ptr_resource_handler_->response();
   ASSERT_TRUE(response);
 
@@ skipping 18 matching lines @@
 
 // Test that an HTTPS redirect response has the expected security info
 // attached to it.
 TEST_F(HTTPSSecurityInfoResourceLoaderTest,
        SecurityInfoOnHTTPSRedirectResource) {
   // Start the request and wait for it to finish.
   std::unique_ptr<net::URLRequest> request(
       resource_context_.GetRequestContext()->CreateRequest(
           test_https_redirect_url(), net::DEFAULT_PRIORITY,
           nullptr /* delegate */));
-  SetUpResourceLoader(std::move(request), true);
+  SetUpResourceLoader(std::move(request), true, true);
 
   // Send the request and wait until it completes.
   loader_->StartRequest();
   raw_ptr_resource_handler_->WaitForResponseComplete();
   ASSERT_EQ(net::URLRequestStatus::SUCCESS,
             raw_ptr_to_request_->status().status());
   ASSERT_TRUE(raw_ptr_resource_handler_->received_request_redirected());
 
   ResourceResponse* redirect_response =
       raw_ptr_resource_handler_->redirect_response();
@@ skipping 14 matching lines @@
   EXPECT_TRUE(cert->Equals(GetTestCert().get()));
 
   EXPECT_EQ(kTestCertError, deserialized.cert_status);
   EXPECT_EQ(kTestConnectionStatus, deserialized.connection_status);
   EXPECT_EQ(kTestSecurityBits, deserialized.security_bits);
 }
 
 class EffectiveConnectionTypeResourceLoaderTest : public ResourceLoaderTest {
  public:
   void VerifyEffectiveConnectionType(
-      bool is_main_frame,
+      bool is_main_frame_request,
+      bool belongs_to_main_frame,
       net::EffectiveConnectionType set_type,
       net::EffectiveConnectionType expected_type) {
     network_quality_estimator()->set_effective_connection_type(set_type);
 
     // Start the request and wait for it to finish.
     std::unique_ptr<net::URLRequest> request(
         resource_context_.GetRequestContext()->CreateRequest(
             test_url(), net::DEFAULT_PRIORITY, nullptr /* delegate */));
-    SetUpResourceLoader(std::move(request), is_main_frame);
+    SetUpResourceLoader(std::move(request), is_main_frame_request,
+                        belongs_to_main_frame);
 
     // Send the request and wait until it completes.
     loader_->StartRequest();
     raw_ptr_resource_handler_->WaitForResponseComplete();
     ASSERT_EQ(net::URLRequestStatus::SUCCESS,
               raw_ptr_to_request_->status().status());
 
     EXPECT_EQ(expected_type,
               raw_ptr_resource_handler_->observed_effective_connection_type());
   }
 };
 
 // Tests that the effective connection type is set on main frame requests.
 TEST_F(EffectiveConnectionTypeResourceLoaderTest, Slow2G) {
-  VerifyEffectiveConnectionType(true, net::EFFECTIVE_CONNECTION_TYPE_SLOW_2G,
+  VerifyEffectiveConnectionType(true, true,
+                                net::EFFECTIVE_CONNECTION_TYPE_SLOW_2G,
                                 net::EFFECTIVE_CONNECTION_TYPE_SLOW_2G);
 }
 
 // Tests that the effective connection type is set on main frame requests.
 TEST_F(EffectiveConnectionTypeResourceLoaderTest, 3G) {
-  VerifyEffectiveConnectionType(true, net::EFFECTIVE_CONNECTION_TYPE_3G,
+  VerifyEffectiveConnectionType(true, true, net::EFFECTIVE_CONNECTION_TYPE_3G,
                                 net::EFFECTIVE_CONNECTION_TYPE_3G);
 }
 
+// Tests that the effective connection type is not set on requests that belong
+// to main frame.
+TEST_F(EffectiveConnectionTypeResourceLoaderTest, BelongsToMainFrame) {
+  VerifyEffectiveConnectionType(false, true, net::EFFECTIVE_CONNECTION_TYPE_3G,
+                                net::EFFECTIVE_CONNECTION_TYPE_UNKNOWN);
+}
+
 // Tests that the effective connection type is not set on non-main frame
 // requests.
-TEST_F(EffectiveConnectionTypeResourceLoaderTest, NotAMainFrame) {
-  VerifyEffectiveConnectionType(false, net::EFFECTIVE_CONNECTION_TYPE_3G,
+TEST_F(EffectiveConnectionTypeResourceLoaderTest, DoesNotBelongToMainFrame) {
+  VerifyEffectiveConnectionType(false, false, net::EFFECTIVE_CONNECTION_TYPE_3G,
                                 net::EFFECTIVE_CONNECTION_TYPE_UNKNOWN);
 }
 
 }  // namespace content