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

chrome/browser/google_apis/test_util.h

Index: chrome/browser/google_apis/test_util.h
diff --git a/chrome/browser/google_apis/test_util.h b/chrome/browser/google_apis/test_util.h
index edb635d36cb272dfba49b786b3cb235e31eb64cc..8ee5ee78ce265a7f4e7eb4bc654a50f52964edbc 100644
--- a/chrome/browser/google_apis/test_util.h
+++ b/chrome/browser/google_apis/test_util.h
@@ -26,8 +26,9 @@ class Value;
 
 namespace net {
 namespace test_server {
-struct HttpRequest;
+class BasicHttpResponse;
 class HttpResponse;
+struct HttpRequest;
 }
 }
 
@@ -89,7 +90,7 @@ bool CreateFileOfSpecifiedSize(const base::FilePath& temp_dir,
 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