OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "base/files/file_proxy.h" | 5 #include "base/files/file_proxy.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/files/file.h" | 8 #include "base/files/file.h" |
9 #include "base/files/file_util.h" | 9 #include "base/files/file_util.h" |
10 #include "base/files/scoped_temp_dir.h" | 10 #include "base/files/scoped_temp_dir.h" |
11 #include "base/memory/weak_ptr.h" | 11 #include "base/memory/weak_ptr.h" |
| 12 #include "base/message_loop/message_loop.h" |
12 #include "base/threading/thread.h" | 13 #include "base/threading/thread.h" |
13 #include "base/threading/thread_restrictions.h" | 14 #include "base/threading/thread_restrictions.h" |
14 #include "testing/gtest/include/gtest/gtest.h" | 15 #include "testing/gtest/include/gtest/gtest.h" |
15 | 16 |
16 namespace base { | 17 namespace base { |
17 | 18 |
18 class FileProxyTest : public testing::Test { | 19 class FileProxyTest : public testing::Test { |
19 public: | 20 public: |
20 FileProxyTest() | 21 FileProxyTest() |
21 : file_thread_("FileProxyTestFileThread"), | 22 : file_thread_("FileProxyTestFileThread"), |
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
71 protected: | 72 protected: |
72 void CreateProxy(uint32 flags, FileProxy* proxy) { | 73 void CreateProxy(uint32 flags, FileProxy* proxy) { |
73 proxy->CreateOrOpen( | 74 proxy->CreateOrOpen( |
74 test_path(), flags, | 75 test_path(), flags, |
75 Bind(&FileProxyTest::DidCreateOrOpen, weak_factory_.GetWeakPtr())); | 76 Bind(&FileProxyTest::DidCreateOrOpen, weak_factory_.GetWeakPtr())); |
76 MessageLoop::current()->Run(); | 77 MessageLoop::current()->Run(); |
77 EXPECT_TRUE(proxy->IsValid()); | 78 EXPECT_TRUE(proxy->IsValid()); |
78 } | 79 } |
79 | 80 |
80 TaskRunner* file_task_runner() const { | 81 TaskRunner* file_task_runner() const { |
81 return file_thread_.task_runner().get(); | 82 return file_thread_.message_loop_proxy().get(); |
82 } | 83 } |
83 const FilePath& test_dir_path() const { return dir_.path(); } | 84 const FilePath& test_dir_path() const { return dir_.path(); } |
84 const FilePath test_path() const { return dir_.path().AppendASCII("test"); } | 85 const FilePath test_path() const { return dir_.path().AppendASCII("test"); } |
85 | 86 |
86 MessageLoopForIO message_loop_; | 87 MessageLoopForIO message_loop_; |
87 Thread file_thread_; | 88 Thread file_thread_; |
88 | 89 |
89 ScopedTempDir dir_; | 90 ScopedTempDir dir_; |
90 File::Error error_; | 91 File::Error error_; |
91 FilePath path_; | 92 FilePath path_; |
(...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
360 char buffer[53]; | 361 char buffer[53]; |
361 EXPECT_EQ(53, base::ReadFile(test_path(), buffer, 53)); | 362 EXPECT_EQ(53, base::ReadFile(test_path(), buffer, 53)); |
362 int i = 0; | 363 int i = 0; |
363 for (; i < 10; ++i) | 364 for (; i < 10; ++i) |
364 EXPECT_EQ(kTestData[i], buffer[i]); | 365 EXPECT_EQ(kTestData[i], buffer[i]); |
365 for (; i < 53; ++i) | 366 for (; i < 53; ++i) |
366 EXPECT_EQ(0, buffer[i]); | 367 EXPECT_EQ(0, buffer[i]); |
367 } | 368 } |
368 | 369 |
369 } // namespace base | 370 } // namespace base |
OLD | NEW |