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

Side by Side Diff: sync/test/engine/test_directory_setter_upper.h

Issue 10946042: Remove ScopedTempDir from sync test utility class (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 3 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 | « no previous file | sync/test/engine/test_directory_setter_upper.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 // A handy class that takes care of setting up and destroying a 5 // A handy class that takes care of setting up and destroying a
6 // syncable::Directory instance for unit tests that require one. 6 // syncable::Directory instance for unit tests that require one.
7 // 7 //
8 // The expected usage is to make this a component of your test fixture: 8 // The expected usage is to make this a component of your test fixture:
9 // 9 //
10 // class AwesomenessTest : public testing::Test { 10 // class AwesomenessTest : public testing::Test {
(...skipping 16 matching lines...) Expand all
27 // 27 //
28 28
29 #ifndef SYNC_TEST_ENGINE_TEST_DIRECTORY_SETTER_UPPER_H_ 29 #ifndef SYNC_TEST_ENGINE_TEST_DIRECTORY_SETTER_UPPER_H_
30 #define SYNC_TEST_ENGINE_TEST_DIRECTORY_SETTER_UPPER_H_ 30 #define SYNC_TEST_ENGINE_TEST_DIRECTORY_SETTER_UPPER_H_
31 31
32 #include <string> 32 #include <string>
33 33
34 #include "base/basictypes.h" 34 #include "base/basictypes.h"
35 #include "base/compiler_specific.h" 35 #include "base/compiler_specific.h"
36 #include "base/memory/scoped_ptr.h" 36 #include "base/memory/scoped_ptr.h"
37 #include "base/scoped_temp_dir.h"
38 #include "sync/test/fake_sync_encryption_handler.h" 37 #include "sync/test/fake_sync_encryption_handler.h"
39 #include "sync/test/null_directory_change_delegate.h" 38 #include "sync/test/null_directory_change_delegate.h"
40 #include "sync/util/test_unrecoverable_error_handler.h" 39 #include "sync/util/test_unrecoverable_error_handler.h"
41 #include "testing/gmock/include/gmock/gmock.h" 40 #include "testing/gmock/include/gmock/gmock.h"
42 41
43 namespace syncable { 42 namespace syncable {
44 class Directory; 43 class Directory;
45 } 44 }
46 45
47 namespace syncer { 46 namespace syncer {
(...skipping 14 matching lines...) Expand all
62 syncable::Directory* directory() { return directory_.get(); } 61 syncable::Directory* directory() { return directory_.get(); }
63 62
64 SyncEncryptionHandler* encryption_handler() { return &encryption_handler_; } 63 SyncEncryptionHandler* encryption_handler() { return &encryption_handler_; }
65 64
66 private: 65 private:
67 syncable::NullDirectoryChangeDelegate delegate_; 66 syncable::NullDirectoryChangeDelegate delegate_;
68 TestUnrecoverableErrorHandler handler_; 67 TestUnrecoverableErrorHandler handler_;
69 68
70 void RunInvariantCheck(); 69 void RunInvariantCheck();
71 70
72 ScopedTempDir temp_dir_;
73 FakeSyncEncryptionHandler encryption_handler_; 71 FakeSyncEncryptionHandler encryption_handler_;
74 scoped_ptr<syncable::Directory> directory_; 72 scoped_ptr<syncable::Directory> directory_;
75 std::string name_; 73 std::string name_;
76 74
77 DISALLOW_COPY_AND_ASSIGN(TestDirectorySetterUpper); 75 DISALLOW_COPY_AND_ASSIGN(TestDirectorySetterUpper);
78 }; 76 };
79 77
80 } // namespace syncer 78 } // namespace syncer
81 79
82 #endif // SYNC_TEST_ENGINE_TEST_DIRECTORY_SETTER_UPPER_H_ 80 #endif // SYNC_TEST_ENGINE_TEST_DIRECTORY_SETTER_UPPER_H_
OLDNEW
« no previous file with comments | « no previous file | sync/test/engine/test_directory_setter_upper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698