Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3152)

Unified Diff: chrome/browser/chromeos/contacts/gdata_contacts_service_unittest.cc

Issue 15505003: GTTF: Convert most tests in content to use EmbeddedTestServer. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: clang Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/oobe_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/contacts/gdata_contacts_service_unittest.cc
diff --git a/chrome/browser/chromeos/contacts/gdata_contacts_service_unittest.cc b/chrome/browser/chromeos/contacts/gdata_contacts_service_unittest.cc
index 7103eae0ec4a599aeb791710a27d55cde713b4ca..fbf88099b5dd18f208b0754c5f1bc90d9ea3ce4a 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_;
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/oobe_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698