| Index: chrome/browser/chromeos/gdata/gdata_operations_unittest.cc
|
| diff --git a/chrome/browser/chromeos/gdata/gdata_operations_unittest.cc b/chrome/browser/chromeos/gdata/gdata_operations_unittest.cc
|
| index e753e4839d2d59d1d06d6fe52b0682c8a7222a23..810290b945ae69b72101311e48fede85f450fe1c 100644
|
| --- a/chrome/browser/chromeos/gdata/gdata_operations_unittest.cc
|
| +++ b/chrome/browser/chromeos/gdata/gdata_operations_unittest.cc
|
| @@ -49,9 +49,9 @@ class JsonParseTestGetDataOperation : public GetDataOperation {
|
| }
|
| };
|
|
|
| -void GetDataOperationParseJsonCallback(GDataErrorCode* error_out,
|
| +void GetDataOperationParseJsonCallback(DriveErrorCode* error_out,
|
| scoped_ptr<base::Value>* value_out,
|
| - GDataErrorCode error_in,
|
| + DriveErrorCode error_in,
|
| scoped_ptr<base::Value> value_in) {
|
| value_out->swap(value_in);
|
| *error_out = error_in;
|
| @@ -80,7 +80,7 @@ class GDataOperationsTest : public testing::Test {
|
|
|
| TEST_F(GDataOperationsTest, GetDataOperationParseJson) {
|
| scoped_ptr<base::Value> value;
|
| - GDataErrorCode error;
|
| + DriveErrorCode error;
|
| gdata::GetDataCallback cb = base::Bind(&GetDataOperationParseJsonCallback,
|
| &error,
|
| &value);
|
| @@ -149,7 +149,7 @@ TEST_F(GDataOperationsTest, GetDataOperationParseJson) {
|
|
|
| TEST_F(GDataOperationsTest, GetDataOperationParseInvalidJson) {
|
| scoped_ptr<base::Value> value;
|
| - GDataErrorCode error;
|
| + DriveErrorCode error;
|
| gdata::GetDataCallback cb = base::Bind(&GetDataOperationParseJsonCallback,
|
| &error,
|
| &value);
|
| @@ -172,7 +172,7 @@ TEST_F(GDataOperationsTest, GetDataOperationParseInvalidJson) {
|
| getData->ParseResponse(HTTP_SUCCESS, invalid_json_str);
|
| test_util::RunBlockingPoolTask();
|
|
|
| - EXPECT_EQ(GDATA_PARSE_ERROR, error);
|
| + EXPECT_EQ(DRIVE_PARSE_ERROR, error);
|
| ASSERT_TRUE(value.get() == NULL);
|
| }
|
| }
|
|
|