Update To 11.40.268.0

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

diff --git a/src/google_apis/drive/drive_api_requests_unittest.cc b/src/google_apis/drive/drive_api_requests_unittest.cc
index 9281b86..a1bc67a 100644 (file)
--- a/src/google_apis/drive/drive_api_requests_unittest.cc
+++ b/src/google_apis/drive/drive_api_requests_unittest.cc
@@ -3,8 +3,8 @@
 // found in the LICENSE file.
 
 #include "base/bind.h"
-#include "base/file_util.h"
 #include "base/files/file_path.h"
+#include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/json/json_reader.h"
 #include "base/message_loop/message_loop.h"
@@ -64,7 +64,7 @@ class DriveApiRequestsTest : public testing::Test {
   DriveApiRequestsTest() {
   }
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     request_context_getter_ = new net::TestURLRequestContextGetter(
         message_loop_.message_loop_proxy());
 
@@ -165,7 +165,7 @@ class DriveApiRequestsTest : public testing::Test {
     scoped_ptr<net::test_server::BasicHttpResponse> http_response(
         new net::test_server::BasicHttpResponse);
     http_response->set_code(net::HTTP_NO_CONTENT);
-    return http_response.PassAs<net::test_server::HttpResponse>();
+    return http_response.Pass();
   }
 
   // Reads the data file of |expected_data_file_path_| and returns its content
@@ -183,8 +183,7 @@ class DriveApiRequestsTest : public testing::Test {
     http_request_ = request;
 
     // Return the response from the data file.
-    return test_util::CreateHttpResponseFromFile(
-        expected_data_file_path_).PassAs<net::test_server::HttpResponse>();
+    return test_util::CreateHttpResponseFromFile(expected_data_file_path_);
   }
 
   // Deletes the resource and returns no content with HTTP_NO_CONTENT status
@@ -204,7 +203,7 @@ class DriveApiRequestsTest : public testing::Test {
         new net::test_server::BasicHttpResponse);
     response->set_code(net::HTTP_NO_CONTENT);
 
-    return response.PassAs<net::test_server::HttpResponse>();
+    return response.Pass();
   }
 
   // Returns PRECONDITION_FAILED response for ETag mismatching with error JSON
@@ -231,7 +230,7 @@ class DriveApiRequestsTest : public testing::Test {
       response->set_content_type("application/json");
     }
 
-    return response.PassAs<net::test_server::HttpResponse>();
+    return response.Pass();
   }
 
   // Returns the response based on set expected upload url.
@@ -267,7 +266,7 @@ class DriveApiRequestsTest : public testing::Test {
     response->AddCustomHeader(
         "Location",
         test_server_.base_url().Resolve(expected_upload_path_).spec());
-    return response.PassAs<net::test_server::HttpResponse>();
+    return response.Pass();
   }
 
   scoped_ptr<net::test_server::HttpResponse> HandleResumeUploadRequest(
@@ -318,7 +317,7 @@ class DriveApiRequestsTest : public testing::Test {
             "Range", "bytes=0-" + base::Int64ToString(received_bytes_ - 1));
       }
 
-      return response.PassAs<net::test_server::HttpResponse>();
+      return response.Pass();
     }
 
     // All bytes are received. Return the "success" response with the file's
@@ -332,7 +331,7 @@ class DriveApiRequestsTest : public testing::Test {
       response->set_code(net::HTTP_CREATED);
     }
 
-    return response.PassAs<net::test_server::HttpResponse>();
+    return response.Pass();
   }
 
   // Returns the response based on set expected content and its type.
@@ -353,7 +352,7 @@ class DriveApiRequestsTest : public testing::Test {
     response->set_code(net::HTTP_OK);
     response->set_content_type(expected_content_type_);
     response->set_content(expected_content_);
-    return response.PassAs<net::test_server::HttpResponse>();
+    return response.Pass();
   }
 
   // Handles a request for downloading a file.
@@ -375,7 +374,7 @@ class DriveApiRequestsTest : public testing::Test {
     response->set_code(net::HTTP_OK);
     response->set_content(id + id + id);
     response->set_content_type("text/plain");
-    return response.PassAs<net::test_server::HttpResponse>();
+    return response.Pass();
   }
 
   // These are for the current upload file status.
@@ -569,7 +568,7 @@ TEST_F(DriveApiRequestsTest, AboutGetRequest_ValidJson) {
 TEST_F(DriveApiRequestsTest, AboutGetRequest_InvalidJson) {
   // Set an expected data file containing invalid result.
   expected_data_file_path_ = test_util::GetTestFilePath(
-      "gdata/testfile.txt");
+      "drive/testfile.txt");
 
   GDataErrorCode error = GDATA_OTHER_ERROR;
   scoped_ptr<AboutResource> about_resource;