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

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

Issue 10699044: [Sync] Move sync/{internal_api,syncable} into syncer namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Sync to head Created 8 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
« no previous file with comments | « sync/test/engine/syncer_command_test.cc ('k') | sync/test/engine/test_syncable_utils.h » ('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 #include "sync/test/engine/test_directory_setter_upper.h" 5 #include "sync/test/engine/test_directory_setter_upper.h"
6 6
7 #include "base/compiler_specific.h" 7 #include "base/compiler_specific.h"
8 #include "base/file_util.h" 8 #include "base/file_util.h"
9 #include "base/location.h" 9 #include "base/location.h"
10 #include "base/string_util.h" 10 #include "base/string_util.h"
11 #include "sync/syncable/directory.h" 11 #include "sync/syncable/directory.h"
12 #include "sync/syncable/in_memory_directory_backing_store.h" 12 #include "sync/syncable/in_memory_directory_backing_store.h"
13 #include "sync/syncable/read_transaction.h" 13 #include "sync/syncable/read_transaction.h"
14 #include "sync/test/null_transaction_observer.h" 14 #include "sync/test/null_transaction_observer.h"
15 #include "testing/gtest/include/gtest/gtest.h" 15 #include "testing/gtest/include/gtest/gtest.h"
16 16
17 namespace syncer {
18
17 using syncable::NullTransactionObserver; 19 using syncable::NullTransactionObserver;
18 using syncable::ReadTransaction;
19
20 namespace syncer {
21 20
22 TestDirectorySetterUpper::TestDirectorySetterUpper() : name_("Test") {} 21 TestDirectorySetterUpper::TestDirectorySetterUpper() : name_("Test") {}
23 22
24 TestDirectorySetterUpper::~TestDirectorySetterUpper() {} 23 TestDirectorySetterUpper::~TestDirectorySetterUpper() {}
25 24
26 void TestDirectorySetterUpper::SetUp() { 25 void TestDirectorySetterUpper::SetUp() {
27 directory_.reset(new syncable::Directory(&encryptor_, &handler_, NULL, 26 directory_.reset(new syncable::Directory(&encryptor_, &handler_, NULL,
28 new syncable::InMemoryDirectoryBackingStore(name_))); 27 new syncable::InMemoryDirectoryBackingStore(name_)));
29 ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); 28 ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
30 ASSERT_EQ(syncable::OPENED, directory_->Open( 29 ASSERT_EQ(syncable::OPENED, directory_->Open(
(...skipping 17 matching lines...) Expand all
48 void TestDirectorySetterUpper::RunInvariantCheck() { 47 void TestDirectorySetterUpper::RunInvariantCheck() {
49 // Check invariants for all items. 48 // Check invariants for all items.
50 syncable::ReadTransaction trans(FROM_HERE, directory()); 49 syncable::ReadTransaction trans(FROM_HERE, directory());
51 50
52 // The TestUnrecoverableErrorHandler that this directory was constructed with 51 // The TestUnrecoverableErrorHandler that this directory was constructed with
53 // will handle error reporting, so we can safely ignore the return value. 52 // will handle error reporting, so we can safely ignore the return value.
54 directory()->FullyCheckTreeInvariants(&trans); 53 directory()->FullyCheckTreeInvariants(&trans);
55 } 54 }
56 55
57 } // namespace syncer 56 } // namespace syncer
OLDNEW
« no previous file with comments | « sync/test/engine/syncer_command_test.cc ('k') | sync/test/engine/test_syncable_utils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698