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

Side by Side Diff: chrome/browser/chromeos/drive/change_list_processor_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 (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 "chrome/browser/chromeos/drive/change_list_processor.h" 5 #include "chrome/browser/chromeos/drive/change_list_processor.h"
6 6
7 #include "base/files/scoped_temp_dir.h" 7 #include "base/files/scoped_temp_dir.h"
8 #include "base/message_loop/message_loop_proxy.h" 8 #include "base/message_loop/message_loop_proxy.h"
9 #include "base/values.h" 9 #include "base/values.h"
10 #include "chrome/browser/chromeos/drive/drive.pb.h" 10 #include "chrome/browser/chromeos/drive/drive.pb.h"
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 file.set_resource_id("1_orphanfile_resource_id"); 88 file.set_resource_id("1_orphanfile_resource_id");
89 change_lists[0]->mutable_entries()->push_back(file); 89 change_lists[0]->mutable_entries()->push_back(file);
90 change_lists[0]->mutable_parent_resource_ids()->push_back(""); 90 change_lists[0]->mutable_parent_resource_ids()->push_back("");
91 91
92 change_lists[0]->set_largest_changestamp(kBaseResourceListChangestamp); 92 change_lists[0]->set_largest_changestamp(kBaseResourceListChangestamp);
93 return change_lists.Pass(); 93 return change_lists.Pass();
94 } 94 }
95 95
96 class ChangeListProcessorTest : public testing::Test { 96 class ChangeListProcessorTest : public testing::Test {
97 protected: 97 protected:
98 virtual void SetUp() OVERRIDE { 98 virtual void SetUp() override {
99 ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); 99 ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
100 100
101 metadata_storage_.reset(new ResourceMetadataStorage( 101 metadata_storage_.reset(new ResourceMetadataStorage(
102 temp_dir_.path(), base::MessageLoopProxy::current().get())); 102 temp_dir_.path(), base::MessageLoopProxy::current().get()));
103 ASSERT_TRUE(metadata_storage_->Initialize()); 103 ASSERT_TRUE(metadata_storage_->Initialize());
104 104
105 fake_free_disk_space_getter_.reset(new FakeFreeDiskSpaceGetter); 105 fake_free_disk_space_getter_.reset(new FakeFreeDiskSpaceGetter);
106 cache_.reset(new FileCache(metadata_storage_.get(), 106 cache_.reset(new FileCache(metadata_storage_.get(),
107 temp_dir_.path(), 107 temp_dir_.path(),
108 base::MessageLoopProxy::current().get(), 108 base::MessageLoopProxy::current().get(),
(...skipping 531 matching lines...) Expand 10 before | Expand all | Expand 10 after
640 ApplyChangeList(change_lists.Pass(), &changed_files)); 640 ApplyChangeList(change_lists.Pass(), &changed_files));
641 641
642 // The change is rejected due to the old modification date. 642 // The change is rejected due to the old modification date.
643 ResourceEntry entry; 643 ResourceEntry entry;
644 EXPECT_EQ(FILE_ERROR_OK, metadata_->GetResourceEntryById(local_id, &entry)); 644 EXPECT_EQ(FILE_ERROR_OK, metadata_->GetResourceEntryById(local_id, &entry));
645 EXPECT_EQ(new_file_local.title(), entry.title()); 645 EXPECT_EQ(new_file_local.title(), entry.title());
646 } 646 }
647 647
648 } // namespace internal 648 } // namespace internal
649 } // namespace drive 649 } // namespace drive
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698