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 "chrome/browser/drive/drive_uploader.h" | 5 #include "chrome/browser/drive/drive_uploader.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
11 #include "base/files/scoped_temp_dir.h" | 11 #include "base/files/scoped_temp_dir.h" |
12 #include "base/memory/scoped_ptr.h" | 12 #include "base/memory/scoped_ptr.h" |
13 #include "base/message_loop/message_loop.h" | 13 #include "base/message_loop/message_loop.h" |
14 #include "base/run_loop.h" | 14 #include "base/run_loop.h" |
15 #include "base/values.h" | 15 #include "base/values.h" |
16 #include "chrome/browser/drive/dummy_drive_service.h" | 16 #include "chrome/browser/drive/dummy_drive_service.h" |
17 #include "chrome/browser/google_apis/test_util.h" | |
18 #include "content/public/test/test_browser_thread_bundle.h" | 17 #include "content/public/test/test_browser_thread_bundle.h" |
| 18 #include "google_apis/drive/test_util.h" |
19 #include "testing/gtest/include/gtest/gtest.h" | 19 #include "testing/gtest/include/gtest/gtest.h" |
20 | 20 |
21 using google_apis::CancelCallback; | 21 using google_apis::CancelCallback; |
22 using google_apis::GDataErrorCode; | 22 using google_apis::GDataErrorCode; |
23 using google_apis::GDATA_NO_CONNECTION; | 23 using google_apis::GDATA_NO_CONNECTION; |
24 using google_apis::GDATA_OTHER_ERROR; | 24 using google_apis::GDATA_OTHER_ERROR; |
25 using google_apis::HTTP_CONFLICT; | 25 using google_apis::HTTP_CONFLICT; |
26 using google_apis::HTTP_CREATED; | 26 using google_apis::HTTP_CREATED; |
27 using google_apis::HTTP_NOT_FOUND; | 27 using google_apis::HTTP_NOT_FOUND; |
28 using google_apis::HTTP_PRECONDITION; | 28 using google_apis::HTTP_PRECONDITION; |
(...skipping 543 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
572 EXPECT_EQ(HTTP_SUCCESS, error); | 572 EXPECT_EQ(HTTP_SUCCESS, error); |
573 EXPECT_TRUE(upload_location.is_empty()); | 573 EXPECT_TRUE(upload_location.is_empty()); |
574 ASSERT_TRUE(resource_entry); | 574 ASSERT_TRUE(resource_entry); |
575 EXPECT_EQ(kTestDummyId, resource_entry->id()); | 575 EXPECT_EQ(kTestDummyId, resource_entry->id()); |
576 ASSERT_EQ(1U, upload_progress_values.size()); | 576 ASSERT_EQ(1U, upload_progress_values.size()); |
577 EXPECT_EQ(test_util::ProgressInfo(1024 * 1024, 1024 * 1024), | 577 EXPECT_EQ(test_util::ProgressInfo(1024 * 1024, 1024 * 1024), |
578 upload_progress_values[0]); | 578 upload_progress_values[0]); |
579 } | 579 } |
580 | 580 |
581 } // namespace drive | 581 } // namespace drive |
OLD | NEW |