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

chrome/browser/google_apis/gdata_wapi_operations_unittest.cc

Index: chrome/browser/google_apis/gdata_wapi_operations_unittest.cc
diff --git a/chrome/browser/google_apis/gdata_wapi_operations_unittest.cc b/chrome/browser/google_apis/gdata_wapi_operations_unittest.cc
index abf2b0271a0f05e72f76e1ee7a9ed31101a56b3a..d3ebf5473c15f20123e57c8f36369ed17924fb53 100644
--- a/chrome/browser/google_apis/gdata_wapi_operations_unittest.cc
+++ b/chrome/browser/google_apis/gdata_wapi_operations_unittest.cc
@@ -109,8 +109,10 @@ class GDataWapiOperationsTest : public testing::Test {
       // This is a request for copying a document.
       // TODO(satorux): we should generate valid JSON data for the newly
       // copied document but for now, just return "file_entry.json"
-      return test_util::CreateHttpResponseFromFile(
-          test_util::GetTestFilePath("chromeos/gdata/file_entry.json"));
+      scoped_ptr<net::test_server::BasicHttpResponse> result(
+          test_util::CreateHttpResponseFromFile(
+              test_util::GetTestFilePath("chromeos/gdata/file_entry.json")));
+      return result.PassAs<net::test_server::HttpResponse>();
     }
 
     if (!test_util::RemovePrefix(absolute_url.path(),
@@ -121,22 +123,29 @@ class GDataWapiOperationsTest : public testing::Test {
 
     if (remaining_path.empty()) {
       // Process the default feed.
-      return test_util::CreateHttpResponseFromFile(
-          test_util::GetTestFilePath("chromeos/gdata/root_feed.json"));
+      scoped_ptr<net::test_server::BasicHttpResponse> result(
+          test_util::CreateHttpResponseFromFile(
+              test_util::GetTestFilePath("chromeos/gdata/root_feed.json")));
+      return result.PassAs<net::test_server::HttpResponse>();
     } else {
       // Process a feed for a single resource ID.
       const std::string resource_id = net::UnescapeURLComponent(
           remaining_path.substr(1), net::UnescapeRule::URL_SPECIAL_CHARS);
       if (resource_id == "file:2_file_resource_id") {
-        return test_util::CreateHttpResponseFromFile(
-            test_util::GetTestFilePath("chromeos/gdata/file_entry.json"));
+        scoped_ptr<net::test_server::BasicHttpResponse> result(
+            test_util::CreateHttpResponseFromFile(
+                test_util::GetTestFilePath("chromeos/gdata/file_entry.json")));
+        return result.PassAs<net::test_server::HttpResponse>();
       } else if (resource_id == "folder:root/contents" &&
                  request.method == net::test_server::METHOD_POST) {
         // This is a request for creating a directory in the root directory.
         // TODO(satorux): we should generate valid JSON data for the newly
         // created directory but for now, just return "directory_entry.json"
-        return test_util::CreateHttpResponseFromFile(
-            test_util::GetTestFilePath("chromeos/gdata/directory_entry.json"));
+        scoped_ptr<net::test_server::BasicHttpResponse> result(
+            test_util::CreateHttpResponseFromFile(
+                test_util::GetTestFilePath(
+                    "chromeos/gdata/directory_entry.json")));
+        return result.PassAs<net::test_server::HttpResponse>();
       } else if (resource_id ==
                  "folder:root/contents/file:2_file_resource_id" &&
                  request.method == net::test_server::METHOD_DELETE) {
@@ -144,15 +153,19 @@ class GDataWapiOperationsTest : public testing::Test {
         // TODO(satorux): Investigate what's returned from the server, and
         // copy it. For now, just return a random file, as the contents don't
         // matter.
-        return test_util::CreateHttpResponseFromFile(
-            test_util::GetTestFilePath("chromeos/gdata/testfile.txt"));
+        scoped_ptr<net::test_server::BasicHttpResponse> result(
+            test_util::CreateHttpResponseFromFile(
+                test_util::GetTestFilePath("chromeos/gdata/testfile.txt")));
+        return result.PassAs<net::test_server::HttpResponse>();
       } else if (resource_id == "invalid_resource_id") {
         // Check if this is an authorization request for an app.
         // This emulates to return invalid formatted result from the server.
         if (request.method == net::test_server::METHOD_PUT &&
             request.content.find("<docs:authorizedApp>") != std::string::npos) {
-          return test_util::CreateHttpResponseFromFile(
-              test_util::GetTestFilePath("chromeos/gdata/testfile.txt"));
+          scoped_ptr<net::test_server::BasicHttpResponse> result(
+              test_util::CreateHttpResponseFromFile(
+                  test_util::GetTestFilePath("chromeos/gdata/testfile.txt")));
+          return result.PassAs<net::test_server::HttpResponse>();
         }
       }
     }
@@ -169,7 +182,7 @@ class GDataWapiOperationsTest : public testing::Test {
     if (absolute_url.path() != "/feeds/metadata/default")
       return scoped_ptr<net::test_server::HttpResponse>();
 
-    scoped_ptr<net::test_server::HttpResponse> result(
+    scoped_ptr<net::test_server::BasicHttpResponse> result(
         test_util::CreateHttpResponseFromFile(
             test_util::GetTestFilePath(
                 "chromeos/gdata/account_metadata.json")));
@@ -191,7 +204,7 @@ class GDataWapiOperationsTest : public testing::Test {
       result->set_content(content);
     }
 
-    return result.Pass();
+    return result.PassAs<net::test_server::HttpResponse>();
   }
 
   // Handles a request for creating a session for uploading.
@@ -204,8 +217,8 @@ class GDataWapiOperationsTest : public testing::Test {
                         "/feeds/upload/create-session/default/private/full",
                         true)) {  // case sensitive
       // This is an initiating upload URL.
-      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);
 
       // Check an ETag.
       std::map<std::string, std::string>::const_iterator found =
@@ -214,7 +227,7 @@ class GDataWapiOperationsTest : public testing::Test {
           found->second != "*" &&
           found->second != kTestETag) {
         http_response->set_code(net::test_server::PRECONDITION);
-        return http_response.Pass();
+        return http_response.PassAs<net::test_server::HttpResponse>();
       }
 
       // Check if the X-Upload-Content-Length is present. If yes, store the
@@ -237,7 +250,7 @@ class GDataWapiOperationsTest : public testing::Test {
         return scoped_ptr<net::test_server::HttpResponse>();
       }
       http_response->AddCustomHeader("Location", upload_url.spec());
-      return http_response.Pass();
+      return http_response.PassAs<net::test_server::HttpResponse>();
     }
 
     return scoped_ptr<net::test_server::HttpResponse>();
@@ -256,7 +269,7 @@ class GDataWapiOperationsTest : public testing::Test {
 
     // TODO(satorux): We should create a correct JSON data for the uploaded
     // file, but for now, just return file_entry.json.
-    scoped_ptr<net::test_server::HttpResponse> response =
+    scoped_ptr<net::test_server::BasicHttpResponse> response =
         test_util::CreateHttpResponseFromFile(
             test_util::GetTestFilePath("chromeos/gdata/file_entry.json"));
     // response.code() is set to SUCCESS. Change it to CREATED if it's a new
@@ -299,7 +312,7 @@ class GDataWapiOperationsTest : public testing::Test {
     if (received_bytes_ < content_length_)
       response->set_code(net::test_server::RESUME_INCOMPLETE);
 
-    return response.Pass();
+    return response.PassAs<net::test_server::HttpResponse>();
   }
 
   MessageLoopForUI message_loop_;