Fix crash in network service webRequest when uploading a file

Eventually we want to use TYPE_RAW_FILE for network service file
uploads, which will work when network service is sandboxed. For now, we
are still using TYPE_FILE, so support this in webReqeust.

Bug: 888441
Change-Id: Icb3acf80d466404ee0a21a726c3f192322a6eb87
Reviewed-on: https://chromium-review.googlesource.com/c/1257672Reviewed-by: Ken Rockot <rockot@chromium.org>
Commit-Queue: Clark DuVall <cduvall@chromium.org>
Cr-Commit-Position: refs/heads/master@{#596386}

extensions/browser/BUILD.gn

@@ -570,6 +570,7 @@ source_set("unit_tests") {
     "api/system_network/system_network_api_unittest.cc",
     "api/web_request/form_data_parser_unittest.cc",
     "api/web_request/upload_data_presenter_unittest.cc",
+    "api/web_request/web_request_info_unittest.cc",
     "api/web_request/web_request_permissions_unittest.cc",
     "api/web_request/web_request_time_tracker_unittest.cc",
     "app_window/app_window_geometry_cache_unittest.cc",

extensions/browser/api/web_request/web_request_info.cc

@@ -175,8 +175,10 @@ bool CreateUploadDataSourcesFromResourceRequest(
         break;
 
       case network::DataElement::TYPE_FILE:
-        // Should not be hit in the Network Service case.
-        NOTREACHED();
+        // TODO(https://crbug.com/715679): This may not work when network
+        // process is sandboxed.
+        data_sources->push_back(
+            std::make_unique<FileUploadDataSource>(element.path()));
         break;
 
       default:

extensions/browser/api/web_request/web_request_info_unittest.cc

+// Copyright 2018 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 "extensions/browser/api/web_request/web_request_info.h"
+
+#include "base/files/file_util.h"
+#include "base/files/scoped_temp_dir.h"
+#include "content/public/test/test_browser_thread_bundle.h"
+#include "extensions/browser/api/web_request/web_request_api_constants.h"
+#include "extensions/browser/extension_navigation_ui_data.h"
+#include "services/network/public/cpp/resource_request_body.h"
+#include "testing/gtest/include/gtest/gtest.h"
+
+#include "base/json/json_writer.h"
+
+namespace extensions {
+namespace {
+constexpr base::FilePath::CharType kFilePath[] = FILE_PATH_LITERAL("some_path");
+}
+
+TEST(WebRequestInfoTest, CreateRequestBodyDataFromFile) {
+  content::TestBrowserThreadBundle test_bundle;
+
+  network::ResourceRequest request;
+  request.method = "POST";
+  request.request_body = base::MakeRefCounted<network::ResourceRequestBody>();
+  request.request_body->AppendFileRange(base::FilePath(kFilePath), 0,
+                                        std::numeric_limits<uint64_t>::max(),
+                                        base::Time());
+  WebRequestInfo info(0, 0, 0, nullptr, 0, nullptr, request, false);
+  ASSERT_TRUE(info.request_body_data);
+  auto* value = info.request_body_data->FindKey(
+      extension_web_request_api_constants::kRequestBodyRawKey);
+  ASSERT_TRUE(value);
+
+  base::ListValue expected_value;
+  auto dict = std::make_unique<base::DictionaryValue>();
+  dict->SetString(extension_web_request_api_constants::kRequestBodyRawFileKey,
+                  kFilePath);
+  expected_value.Append(std::move(dict));
+  EXPECT_TRUE(value->Equals(&expected_value));
+}
+
+}  // namespace extensions