| Index: components/sync/test/engine/test_directory_setter_upper.cc
|
| diff --git a/sync/test/engine/test_directory_setter_upper.cc b/components/sync/test/engine/test_directory_setter_upper.cc
|
| similarity index 76%
|
| rename from sync/test/engine/test_directory_setter_upper.cc
|
| rename to components/sync/test/engine/test_directory_setter_upper.cc
|
| index e71964e37f4726564244e5ee5470c49fefce263c..f7499c16048d1ede5d4bb8b832de85bb8302a012 100644
|
| --- a/sync/test/engine/test_directory_setter_upper.cc
|
| +++ b/components/sync/test/engine/test_directory_setter_upper.cc
|
| @@ -2,18 +2,18 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "sync/test/engine/test_directory_setter_upper.h"
|
| +#include "components/sync/test/engine/test_directory_setter_upper.h"
|
|
|
| #include "base/compiler_specific.h"
|
| #include "base/files/file_util.h"
|
| #include "base/location.h"
|
| #include "base/strings/string_util.h"
|
| -#include "sync/syncable/directory.h"
|
| -#include "sync/syncable/in_memory_directory_backing_store.h"
|
| -#include "sync/syncable/mutable_entry.h"
|
| -#include "sync/syncable/syncable_read_transaction.h"
|
| -#include "sync/syncable/syncable_write_transaction.h"
|
| -#include "sync/test/test_transaction_observer.h"
|
| +#include "components/sync/syncable/directory.h"
|
| +#include "components/sync/syncable/in_memory_directory_backing_store.h"
|
| +#include "components/sync/syncable/mutable_entry.h"
|
| +#include "components/sync/syncable/syncable_read_transaction.h"
|
| +#include "components/sync/syncable/syncable_write_transaction.h"
|
| +#include "components/sync/test/test_transaction_observer.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| namespace syncer {
|
| @@ -31,8 +31,8 @@ void TestDirectorySetterUpper::SetUp() {
|
| new syncable::InMemoryDirectoryBackingStore(name_),
|
| MakeWeakHandle(handler_.GetWeakPtr()), base::Closure(),
|
| &encryption_handler_, encryption_handler_.cryptographer()));
|
| - ASSERT_EQ(syncable::OPENED, directory_->Open(
|
| - name_, &delegate_, transaction_observer));
|
| + ASSERT_EQ(syncable::OPENED,
|
| + directory_->Open(name_, &delegate_, transaction_observer));
|
| }
|
|
|
| void TestDirectorySetterUpper::SetUpWith(
|
| @@ -45,8 +45,8 @@ void TestDirectorySetterUpper::SetUpWith(
|
| directory_.reset(new syncable::Directory(
|
| directory_store, MakeWeakHandle(handler_.GetWeakPtr()), base::Closure(),
|
| &encryption_handler_, encryption_handler_.cryptographer()));
|
| - ASSERT_EQ(syncable::OPENED, directory_->Open(
|
| - name_, &delegate_, transaction_observer));
|
| + ASSERT_EQ(syncable::OPENED,
|
| + directory_->Open(name_, &delegate_, transaction_observer));
|
| }
|
|
|
| void TestDirectorySetterUpper::TearDown() {
|
|
|