Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / google_apis / drive / gdata_wapi_requests_unittest.cc

diff --git a/src/google_apis/drive/gdata_wapi_requests_unittest.cc b/src/google_apis/drive/gdata_wapi_requests_unittest.cc
index 449cb47..c8f0572 100644 (file)
--- a/src/google_apis/drive/gdata_wapi_requests_unittest.cc
+++ b/src/google_apis/drive/gdata_wapi_requests_unittest.cc
@@ -26,7 +26,7 @@ const char kTestUserAgent[] = "test-user-agent";
 
 class GDataWapiRequestsTest : public testing::Test {
  public:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     request_context_getter_ = new net::TestURLRequestContextGetter(
         message_loop_.message_loop_proxy());
 
@@ -56,7 +56,7 @@ class GDataWapiRequestsTest : public testing::Test {
     if (!test_util::RemovePrefix(absolute_url.path(),
                                  "/feeds/default/private/full",
                                  &remaining_path)) {
-      return scoped_ptr<net::test_server::HttpResponse>();
+      return nullptr;
     }
 
     // Process a feed for a single resource ID.
@@ -66,7 +66,7 @@ class GDataWapiRequestsTest : public testing::Test {
       scoped_ptr<net::test_server::BasicHttpResponse> result(
           test_util::CreateHttpResponseFromFile(
               test_util::GetTestFilePath("gdata/file_entry.json")));
-      return result.PassAs<net::test_server::HttpResponse>();
+      return result.Pass();
     } 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.
@@ -75,11 +75,11 @@ class GDataWapiRequestsTest : public testing::Test {
         scoped_ptr<net::test_server::BasicHttpResponse> result(
             test_util::CreateHttpResponseFromFile(
                 test_util::GetTestFilePath("drive/testfile.txt")));
-        return result.PassAs<net::test_server::HttpResponse>();
+        return result.Pass();
       }
     }
 
-    return scoped_ptr<net::test_server::HttpResponse>();
+    return nullptr;
   }
 
   base::MessageLoopForIO message_loop_;  // Test server needs IO thread.