Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(772)

Side by Side Diff: webkit/browser/blob/local_file_stream_reader_unittest.cc

Issue 101143006: Convert base::file_util to use File instead of PlatformFile. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove base:: Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ui/shell_dialogs/select_file_dialog_win.cc ('k') | webkit/browser/database/database_tracker.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "webkit/browser/blob/local_file_stream_reader.h" 5 #include "webkit/browser/blob/local_file_stream_reader.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/file_util.h" 9 #include "base/file_util.h"
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 class LocalFileStreamReaderTest : public testing::Test { 60 class LocalFileStreamReaderTest : public testing::Test {
61 public: 61 public:
62 LocalFileStreamReaderTest() 62 LocalFileStreamReaderTest()
63 : file_thread_("FileUtilProxyTestFileThread") {} 63 : file_thread_("FileUtilProxyTestFileThread") {}
64 64
65 virtual void SetUp() OVERRIDE { 65 virtual void SetUp() OVERRIDE {
66 ASSERT_TRUE(file_thread_.Start()); 66 ASSERT_TRUE(file_thread_.Start());
67 ASSERT_TRUE(dir_.CreateUniqueTempDir()); 67 ASSERT_TRUE(dir_.CreateUniqueTempDir());
68 68
69 file_util::WriteFile(test_path(), kTestData, kTestDataSize); 69 file_util::WriteFile(test_path(), kTestData, kTestDataSize);
70 base::PlatformFileInfo info; 70 base::File::Info info;
71 ASSERT_TRUE(base::GetFileInfo(test_path(), &info)); 71 ASSERT_TRUE(base::GetFileInfo(test_path(), &info));
72 test_file_modification_time_ = info.last_modified; 72 test_file_modification_time_ = info.last_modified;
73 } 73 }
74 74
75 virtual void TearDown() OVERRIDE { 75 virtual void TearDown() OVERRIDE {
76 // Give another chance for deleted streams to perform Close. 76 // Give another chance for deleted streams to perform Close.
77 base::RunLoop().RunUntilIdle(); 77 base::RunLoop().RunUntilIdle();
78 file_thread_.Stop(); 78 file_thread_.Stop();
79 base::RunLoop().RunUntilIdle(); 79 base::RunLoop().RunUntilIdle();
80 } 80 }
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
252 int rv = reader->Read(buf.get(), buf->size(), base::Bind(&NeverCalled)); 252 int rv = reader->Read(buf.get(), buf->size(), base::Bind(&NeverCalled));
253 ASSERT_TRUE(rv == net::ERR_IO_PENDING || rv >= 0); 253 ASSERT_TRUE(rv == net::ERR_IO_PENDING || rv >= 0);
254 254
255 // Delete immediately. 255 // Delete immediately.
256 // Should not crash; nor should NeverCalled be callback. 256 // Should not crash; nor should NeverCalled be callback.
257 reader.reset(); 257 reader.reset();
258 EnsureFileTaskFinished(); 258 EnsureFileTaskFinished();
259 } 259 }
260 260
261 } // namespace webkit_blob 261 } // namespace webkit_blob
OLDNEW
« no previous file with comments | « ui/shell_dialogs/select_file_dialog_win.cc ('k') | webkit/browser/database/database_tracker.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698