Index: chrome/browser/chromeos/file_system_provider/operations/open_file_unittest.cc |
diff --git a/chrome/browser/chromeos/file_system_provider/operations/open_file_unittest.cc b/chrome/browser/chromeos/file_system_provider/operations/open_file_unittest.cc |
index 02fff320514f88842900c2196a289ed42a7d6faf..8f4b34d7c577fc96a9df6c1123a4d8d337c6debc 100644 |
--- a/chrome/browser/chromeos/file_system_provider/operations/open_file_unittest.cc |
+++ b/chrome/browser/chromeos/file_system_provider/operations/open_file_unittest.cc |
@@ -52,19 +52,38 @@ class LoggingDispatchEventImpl { |
// Callback invocation logger. Acts as a fileapi end-point. |
class CallbackLogger { |
public: |
+ class Event { |
+ public: |
+ Event(int file_handle, base::File::Error result) |
+ : file_handle_(file_handle), result_(result) {} |
+ virtual ~Event() {} |
+ |
+ int file_handle() { return file_handle_; } |
+ base::File::Error result() { return result_; } |
+ |
+ private: |
+ int file_handle_; |
+ base::File::Error result_; |
+ |
+ DISALLOW_COPY_AND_ASSIGN(Event); |
+ }; |
+ |
CallbackLogger() : weak_ptr_factory_(this) {} |
virtual ~CallbackLogger() {} |
- void OnOpenFile(base::File::Error result) { events_.push_back(result); } |
+ void OnOpenFile(int file_handle, base::File::Error result) { |
+ events_.push_back(new Event(file_handle, result)); |
+ } |
- std::vector<base::File::Error>& events() { return events_; } |
+ ScopedVector<Event>& events() { return events_; } |
base::WeakPtr<CallbackLogger> GetWeakPtr() { |
return weak_ptr_factory_.GetWeakPtr(); |
} |
private: |
- std::vector<base::File::Error> events_; |
+ ScopedVector<Event> events_; |
+ bool dispatch_reply_; |
base::WeakPtrFactory<CallbackLogger> weak_ptr_factory_; |
DISALLOW_COPY_AND_ASSIGN(CallbackLogger); |
@@ -180,7 +199,9 @@ TEST_F(FileSystemProviderOperationsOpenFileTest, OnSuccess) { |
scoped_ptr<RequestValue>(new RequestValue()), |
false /* has_next */); |
ASSERT_EQ(1u, callback_logger.events().size()); |
- EXPECT_EQ(base::File::FILE_OK, callback_logger.events()[0]); |
+ CallbackLogger::Event* event = callback_logger.events()[0]; |
+ EXPECT_EQ(base::File::FILE_OK, event->result()); |
+ EXPECT_LT(0, event->file_handle()); |
} |
TEST_F(FileSystemProviderOperationsOpenFileTest, OnError) { |
@@ -206,8 +227,9 @@ TEST_F(FileSystemProviderOperationsOpenFileTest, OnError) { |
open_file.OnError(kRequestId, base::File::FILE_ERROR_TOO_MANY_OPENED); |
ASSERT_EQ(1u, callback_logger.events().size()); |
- EXPECT_EQ(base::File::FILE_ERROR_TOO_MANY_OPENED, |
- callback_logger.events()[0]); |
+ CallbackLogger::Event* event = callback_logger.events()[0]; |
+ EXPECT_EQ(base::File::FILE_ERROR_TOO_MANY_OPENED, event->result()); |
+ ASSERT_EQ(0, event->file_handle()); |
} |
} // namespace operations |