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

Side by Side Diff: chrome/browser/chromeos/drive/resource_metadata_unittest.cc

Issue 18419004: Remove destruction-only TearDown() methods in Drive related test. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Review fix Created 7 years, 5 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
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/resource_metadata.h" 5 #include "chrome/browser/chromeos/drive/resource_metadata.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 852 matching lines...) Expand 10 before | Expand all | Expand 10 after
863 ASSERT_TRUE(metadata_storage_->Initialize()); 863 ASSERT_TRUE(metadata_storage_->Initialize());
864 864
865 resource_metadata_.reset(new ResourceMetadata( 865 resource_metadata_.reset(new ResourceMetadata(
866 metadata_storage_.get(), base::MessageLoopProxy::current())); 866 metadata_storage_.get(), base::MessageLoopProxy::current()));
867 867
868 ASSERT_EQ(FILE_ERROR_OK, resource_metadata_->Initialize()); 868 ASSERT_EQ(FILE_ERROR_OK, resource_metadata_->Initialize());
869 869
870 SetUpEntries(resource_metadata_.get()); 870 SetUpEntries(resource_metadata_.get());
871 } 871 }
872 872
873 virtual void TearDown() OVERRIDE {
874 }
875
876 base::ScopedTempDir temp_dir_; 873 base::ScopedTempDir temp_dir_;
877 content::TestBrowserThreadBundle thread_bundle_; 874 content::TestBrowserThreadBundle thread_bundle_;
878 scoped_ptr<ResourceMetadataStorage, test_util::DestroyHelperForTests> 875 scoped_ptr<ResourceMetadataStorage, test_util::DestroyHelperForTests>
879 metadata_storage_; 876 metadata_storage_;
880 scoped_ptr<ResourceMetadata, test_util::DestroyHelperForTests> 877 scoped_ptr<ResourceMetadata, test_util::DestroyHelperForTests>
881 resource_metadata_; 878 resource_metadata_;
882 }; 879 };
883 880
884 TEST_F(ResourceMetadataTest, RefreshEntry) { 881 TEST_F(ResourceMetadataTest, RefreshEntry) {
885 base::FilePath drive_file_path; 882 base::FilePath drive_file_path;
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after
1079 else 1076 else
1080 ++directory_count; 1077 ++directory_count;
1081 } 1078 }
1082 1079
1083 EXPECT_EQ(7, file_count); 1080 EXPECT_EQ(7, file_count);
1084 EXPECT_EQ(6, directory_count); 1081 EXPECT_EQ(6, directory_count);
1085 } 1082 }
1086 1083
1087 } // namespace internal 1084 } // namespace internal
1088 } // namespace drive 1085 } // namespace drive
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698