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

This is a resubmit of https://codereview.chromium.org/15505003

TBR=avi

BUG=96594

Review URL: https://codereview.chromium.org/15740023

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@202586 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 2 insertions, 2 deletions

diff --git a/chrome/browser/chromeos/contacts/gdata_contacts_service_unittest.cc b/chrome/browser/chromeos/contacts/gdata_contacts_service_unittest.cc
index 7103eae..fbf8809 100644
--- a/chrome/browser/chromeos/contacts/gdata_contacts_service_unittest.cc
+++ b/chrome/browser/chromeos/contacts/gdata_contacts_service_unittest.cc
@@ -167,11 +167,11 @@ class GDataContactsServiceTest : public testing::Test {
       const net::test_server::HttpRequest& request) {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
     // Requested url must not contain a query string.
-    scoped_ptr<net::test_server::HttpResponse> result =
+    scoped_ptr<net::test_server::BasicHttpResponse> result =
         google_apis::test_util::CreateHttpResponseFromFile(
             google_apis::test_util::GetTestFilePath(
                 std::string("chromeos/gdata/contacts") + request.relative_url));
-    return result.Pass();
+    return result.PassAs<net::test_server::HttpResponse>();
   }
 
   MessageLoopForUI message_loop_;