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

Side by Side Diff: chrome/browser/chromeos/drive/sync/entry_update_performer_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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/sync/entry_update_performer.h" 5 #include "chrome/browser/chromeos/drive/sync/entry_update_performer.h"
6 6
7 #include "base/callback_helpers.h" 7 #include "base/callback_helpers.h"
8 #include "base/files/file_util.h" 8 #include "base/files/file_util.h"
9 #include "base/md5.h" 9 #include "base/md5.h"
10 #include "base/task_runner_util.h" 10 #include "base/task_runner_util.h"
11 #include "chrome/browser/chromeos/drive/file_cache.h" 11 #include "chrome/browser/chromeos/drive/file_cache.h"
12 #include "chrome/browser/chromeos/drive/file_system/download_operation.h" 12 #include "chrome/browser/chromeos/drive/file_system/download_operation.h"
13 #include "chrome/browser/chromeos/drive/file_system/operation_test_base.h" 13 #include "chrome/browser/chromeos/drive/file_system/operation_test_base.h"
14 #include "chrome/browser/chromeos/drive/job_scheduler.h" 14 #include "chrome/browser/chromeos/drive/job_scheduler.h"
15 #include "chrome/browser/chromeos/drive/resource_metadata.h" 15 #include "chrome/browser/chromeos/drive/resource_metadata.h"
16 #include "chrome/browser/drive/drive_api_util.h" 16 #include "chrome/browser/drive/drive_api_util.h"
17 #include "chrome/browser/drive/fake_drive_service.h" 17 #include "chrome/browser/drive/fake_drive_service.h"
18 #include "content/public/test/test_utils.h" 18 #include "content/public/test/test_utils.h"
19 #include "google_apis/drive/drive_api_parser.h" 19 #include "google_apis/drive/drive_api_parser.h"
20 #include "google_apis/drive/test_util.h" 20 #include "google_apis/drive/test_util.h"
21 #include "testing/gtest/include/gtest/gtest.h" 21 #include "testing/gtest/include/gtest/gtest.h"
22 22
23 namespace drive { 23 namespace drive {
24 namespace internal { 24 namespace internal {
25 25
26 class EntryUpdatePerformerTest : public file_system::OperationTestBase { 26 class EntryUpdatePerformerTest : public file_system::OperationTestBase {
27 protected: 27 protected:
28 virtual void SetUp() OVERRIDE { 28 virtual void SetUp() override {
29 OperationTestBase::SetUp(); 29 OperationTestBase::SetUp();
30 performer_.reset(new EntryUpdatePerformer(blocking_task_runner(), 30 performer_.reset(new EntryUpdatePerformer(blocking_task_runner(),
31 delegate(), 31 delegate(),
32 scheduler(), 32 scheduler(),
33 metadata(), 33 metadata(),
34 cache(), 34 cache(),
35 loader_controller())); 35 loader_controller()));
36 } 36 }
37 37
38 // Stores |content| to the cache and mark it as dirty. 38 // Stores |content| to the cache and mark it as dirty.
(...skipping 550 matching lines...) Expand 10 before | Expand all | Expand 10 after
589 589
590 // This should result in reverting the local change. 590 // This should result in reverting the local change.
591 ResourceEntry result_entry; 591 ResourceEntry result_entry;
592 EXPECT_EQ(FILE_ERROR_OK, 592 EXPECT_EQ(FILE_ERROR_OK,
593 GetLocalResourceEntryById(src_entry.local_id(), &result_entry)); 593 GetLocalResourceEntryById(src_entry.local_id(), &result_entry));
594 EXPECT_EQ(src_entry.title(), result_entry.title()); 594 EXPECT_EQ(src_entry.title(), result_entry.title());
595 } 595 }
596 596
597 } // namespace internal 597 } // namespace internal
598 } // namespace drive 598 } // namespace drive
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698