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

chrome/browser/google_apis/test_util.h

 // 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.
 
 #ifndef CHROME_BROWSER_GOOGLE_APIS_TEST_UTIL_H_
 #define CHROME_BROWSER_GOOGLE_APIS_TEST_UTIL_H_
 
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/template_util.h"
 #include "chrome/browser/google_apis/base_operations.h"
 #include "chrome/browser/google_apis/gdata_errorcode.h"
 
 class GURL;
 
 namespace base {
 class FilePath;
 class Value;
 }
 
 namespace net {
 namespace test_server {
+class BasicHttpResponse;
+class HttpResponse;
 struct HttpRequest;
-class HttpResponse;
 }
 }
 
 namespace google_apis {
 
 class AboutResource;
 class AccountMetadata;
 class AppList;
 class AuthenticatedOperationInterface;
 class ResourceEntry;
@@ skipping 41 matching lines @@
 bool CreateFileOfSpecifiedSize(const base::FilePath& temp_dir,
                                size_t size,
                                base::FilePath* path,
                                std::string* data);
 
 // Loads a test JSON file as a base::Value, from a test file stored under
 // chrome/test/data.
 scoped_ptr<base::Value> LoadJSONFile(const std::string& relative_path);
 
 // 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);
 
 // Handles a request for downloading a file. Reads a file from the test
 // directory and returns the content. Also, copies the |request| to the memory
 // pointed by |out_request|.
 // |base_url| must be set to the server's base url.
 scoped_ptr<net::test_server::HttpResponse> HandleDownloadRequest(
     const GURL& base_url,
     net::test_server::HttpRequest* out_request,
     const net::test_server::HttpRequest& request);
@@ skipping 202 matching lines @@
   const GetContentCallback callback_;
   ScopedVector<std::string> data_;
 
   DISALLOW_COPY_AND_ASSIGN(TestGetContentCallback);
 };
 
 }  // namespace test_util
 }  // namespace google_apis
 
 #endif  // CHROME_BROWSER_GOOGLE_APIS_TEST_UTIL_H_