Revert "Revert 202112 "GTTF: Convert most tests in content to use Embedd...""

chrome/browser/google_apis/test_util.cc

 // Copyright (c) 2012 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/browser/google_apis/test_util.h"
 
 #include "base/file_util.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/json/json_reader.h"
 #include "base/message_loop.h"
@@ skipping 108 matching lines @@
 
   std::string error;
   JSONFileValueSerializer serializer(path);
   scoped_ptr<base::Value> value(serializer.Deserialize(NULL, &error));
   LOG_IF(WARNING, !value.get()) << "Failed to parse " << path.value()
                                 << ": " << error;
   return value.Pass();
 }
 
 // Returns a HttpResponse created from the given file path.
-scoped_ptr<net::test_server::HttpResponse> CreateHttpResponseFromFile(
+scoped_ptr<net::test_server::BasicHttpResponse> CreateHttpResponseFromFile(
     const base::FilePath& file_path) {
   std::string content;
   if (!file_util::ReadFileToString(file_path, &content))
-    return scoped_ptr<net::test_server::HttpResponse>();
+    return scoped_ptr<net::test_server::BasicHttpResponse>();
 
   std::string content_type = "text/plain";
   if (EndsWith(file_path.AsUTF8Unsafe(), ".json", true /* case sensitive */)) {
     content_type = "application/json";
   } else if (EndsWith(file_path.AsUTF8Unsafe(), ".xml", true)) {
     content_type = "application/atom+xml";
   }
 
-  scoped_ptr<net::test_server::HttpResponse> http_response(
-      new net::test_server::HttpResponse);
+  scoped_ptr<net::test_server::BasicHttpResponse> http_response(
+      new net::test_server::BasicHttpResponse);
   http_response->set_code(net::test_server::SUCCESS);
   http_response->set_content(content);
   http_response->set_content_type(content_type);
   return http_response.Pass();
 }
 
 scoped_ptr<net::test_server::HttpResponse> HandleDownloadRequest(
     const GURL& base_url,
     net::test_server::HttpRequest* out_request,
     const net::test_server::HttpRequest& request) {
   *out_request = request;
 
   GURL absolute_url = base_url.Resolve(request.relative_url);
   std::string remaining_path;
   if (!RemovePrefix(absolute_url.path(), "/files/", &remaining_path))
     return scoped_ptr<net::test_server::HttpResponse>();
-  return CreateHttpResponseFromFile(GetTestFilePath(remaining_path));
+  return CreateHttpResponseFromFile(
+      GetTestFilePath(remaining_path)).PassAs<net::test_server::HttpResponse>();
 }
 
 bool VerifyJsonData(const base::FilePath& expected_json_file_path,
                     const base::Value* json_data) {
   if (!json_data) {
     LOG(ERROR) << "json_data is NULL";
     return false;
   }
 
   std::string expected_content;
@@ skipping 66 matching lines @@
   return result;
 }
 
 void TestGetContentCallback::OnGetContent(google_apis::GDataErrorCode error,
                                           scoped_ptr<std::string> data) {
   data_.push_back(data.release());
 }
 
 }  // namespace test_util
 }  // namespace google_apis