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

Side by Side Diff: chrome/browser/chromeos/drive/fileapi/webkit_file_stream_reader_impl_unittest.cc

Issue 623293003: replace OVERRIDE and FINAL with override and final in chrome/browser/chromeos/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: run git cl format on echo_dialog_view.h Created 6 years, 2 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
OLDNEW
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 "chrome/browser/chromeos/drive/fileapi/webkit_file_stream_reader_impl.h " 5 #include "chrome/browser/chromeos/drive/fileapi/webkit_file_stream_reader_impl.h "
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
(...skipping 19 matching lines...) Expand all
30 namespace internal { 30 namespace internal {
31 31
32 class WebkitFileStreamReaderImplTest : public ::testing::Test { 32 class WebkitFileStreamReaderImplTest : public ::testing::Test {
33 protected: 33 protected:
34 // Because the testee should live on IO thread, the main thread is 34 // Because the testee should live on IO thread, the main thread is
35 // reused as IO thread, and UI thread will be run on background. 35 // reused as IO thread, and UI thread will be run on background.
36 WebkitFileStreamReaderImplTest() 36 WebkitFileStreamReaderImplTest()
37 : thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP) { 37 : thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP) {
38 } 38 }
39 39
40 virtual void SetUp() OVERRIDE { 40 virtual void SetUp() override {
41 worker_thread_.reset(new base::Thread("WebkitFileStreamReaderImplTest")); 41 worker_thread_.reset(new base::Thread("WebkitFileStreamReaderImplTest"));
42 ASSERT_TRUE(worker_thread_->Start()); 42 ASSERT_TRUE(worker_thread_->Start());
43 43
44 // Initialize FakeDriveService. 44 // Initialize FakeDriveService.
45 fake_drive_service_.reset(new FakeDriveService); 45 fake_drive_service_.reset(new FakeDriveService);
46 ASSERT_TRUE(test_util::SetUpTestEntries(fake_drive_service_.get())); 46 ASSERT_TRUE(test_util::SetUpTestEntries(fake_drive_service_.get()));
47 47
48 // Create a testee instance. 48 // Create a testee instance.
49 fake_file_system_.reset( 49 fake_file_system_.reset(
50 new test_util::FakeFileSystem(fake_drive_service_.get())); 50 new test_util::FakeFileSystem(fake_drive_service_.get()));
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
223 base::Time::FromInternalValue(1))); 223 base::Time::FromInternalValue(1)));
224 224
225 net::TestInt64CompletionCallback callback; 225 net::TestInt64CompletionCallback callback;
226 int64 result = reader->GetLength(callback.callback()); 226 int64 result = reader->GetLength(callback.callback());
227 result = callback.GetResult(result); 227 result = callback.GetResult(result);
228 EXPECT_EQ(net::ERR_UPLOAD_FILE_CHANGED, result); 228 EXPECT_EQ(net::ERR_UPLOAD_FILE_CHANGED, result);
229 } 229 }
230 230
231 } // namespace internal 231 } // namespace internal
232 } // namespace drive 232 } // namespace drive
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698