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

Unified Diff: sync/internal_api/test/test_user_share.cc

Issue 10534080: sync: move internal_api components used by chrome/browser into internal_api/public (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix test Created 8 years, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sync/internal_api/syncapi_unittest.cc ('k') | sync/internal_api/test_user_share.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/internal_api/test/test_user_share.cc
diff --git a/sync/internal_api/test_user_share.cc b/sync/internal_api/test/test_user_share.cc
similarity index 75%
rename from sync/internal_api/test_user_share.cc
rename to sync/internal_api/test/test_user_share.cc
index 743f3d05b4de2b4c1359b7dccc06e1eff814f87d..c028d669f550d5bc1fb5c00c6d29b9bcc4b767d6 100644
--- a/sync/internal_api/test_user_share.cc
+++ b/sync/internal_api/test/test_user_share.cc
@@ -2,14 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sync/internal_api/test_user_share.h"
+#include "sync/internal_api/public/test/test_user_share.h"
#include "base/compiler_specific.h"
+#include "sync/test/engine/test_directory_setter_upper.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace browser_sync {
-TestUserShare::TestUserShare() {}
+TestUserShare::TestUserShare() : dir_maker_(new TestDirectorySetterUpper()) {}
TestUserShare::~TestUserShare() {
if (user_share_.get())
@@ -18,11 +19,11 @@ TestUserShare::~TestUserShare() {
void TestUserShare::SetUp() {
user_share_.reset(new sync_api::UserShare());
- dir_maker_.SetUp();
+ dir_maker_->SetUp();
// The pointer is owned by dir_maker_, we should not be storing it in a
// scoped_ptr. We must be careful to ensure the scoped_ptr never deletes it.
- user_share_->directory.reset(dir_maker_.directory());
+ user_share_->directory.reset(dir_maker_->directory());
}
void TestUserShare::TearDown() {
@@ -30,7 +31,7 @@ void TestUserShare::TearDown() {
ignore_result(user_share_->directory.release());
user_share_.reset();
- dir_maker_.TearDown();
+ dir_maker_->TearDown();
}
sync_api::UserShare* TestUserShare::user_share() {
« no previous file with comments | « sync/internal_api/syncapi_unittest.cc ('k') | sync/internal_api/test_user_share.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698