| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "google_apis/drive/test_util.h" | 5 #include "google_apis/drive/test_util.h" |
| 6 | 6 |
| 7 #include "base/files/file_util.h" | 7 #include "base/files/file_util.h" |
| 8 #include "base/json/json_file_value_serializer.h" | 8 #include "base/json/json_file_value_serializer.h" |
| 9 #include "base/json/json_reader.h" | 9 #include "base/json/json_reader.h" |
| 10 #include "base/message_loop/message_loop.h" | 10 #include "base/message_loop/message_loop.h" |
| (...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 165 } | 165 } |
| 166 | 166 |
| 167 std::string TestGetContentCallback::GetConcatenatedData() const { | 167 std::string TestGetContentCallback::GetConcatenatedData() const { |
| 168 std::string result; | 168 std::string result; |
| 169 for (size_t i = 0; i < data_.size(); ++i) { | 169 for (size_t i = 0; i < data_.size(); ++i) { |
| 170 result += *data_[i]; | 170 result += *data_[i]; |
| 171 } | 171 } |
| 172 return result; | 172 return result; |
| 173 } | 173 } |
| 174 | 174 |
| 175 void TestGetContentCallback::OnGetContent(google_apis::GDataErrorCode error, | 175 void TestGetContentCallback::OnGetContent(google_apis::DriveApiErrorCode error, |
| 176 scoped_ptr<std::string> data) { | 176 scoped_ptr<std::string> data) { |
| 177 data_.push_back(data.release()); | 177 data_.push_back(data.release()); |
| 178 } | 178 } |
| 179 | 179 |
| 180 } // namespace test_util | 180 } // namespace test_util |
| 181 } // namespace google_apis | 181 } // namespace google_apis |
| OLD | NEW |