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

Unified Diff: components/sync_driver/data_type_manager_impl_unittest.cc

Issue 278053002: Move DataTypeManager into sync_driver component (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix tests Created 6 years, 7 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 | « components/sync_driver/data_type_manager_impl.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/sync_driver/data_type_manager_impl_unittest.cc
diff --git a/chrome/browser/sync/glue/data_type_manager_impl_unittest.cc b/components/sync_driver/data_type_manager_impl_unittest.cc
similarity index 99%
rename from chrome/browser/sync/glue/data_type_manager_impl_unittest.cc
rename to components/sync_driver/data_type_manager_impl_unittest.cc
index acb8670ea99188671d779d5ad4400d2744e4eecc..0ed7560f006323d12c436796fd83f1c25ab96480 100644
--- a/chrome/browser/sync/glue/data_type_manager_impl_unittest.cc
+++ b/components/sync_driver/data_type_manager_impl_unittest.cc
@@ -2,18 +2,16 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/sync/glue/data_type_manager_impl.h"
+#include "components/sync_driver/data_type_manager_impl.h"
#include "base/compiler_specific.h"
#include "base/message_loop/message_loop.h"
-#include "chrome/browser/chrome_notification_types.h"
#include "components/sync_driver/backend_data_type_configurer.h"
#include "components/sync_driver/data_type_controller.h"
#include "components/sync_driver/data_type_encryption_handler.h"
#include "components/sync_driver/data_type_manager_observer.h"
#include "components/sync_driver/failed_data_types_handler.h"
#include "components/sync_driver/fake_data_type_controller.h"
-#include "content/public/test/test_browser_thread.h"
#include "sync/internal_api/public/base/model_type.h"
#include "sync/internal_api/public/configure_reason.h"
#include "testing/gmock/include/gmock/gmock.h"
@@ -148,7 +146,8 @@ class TestDataTypeManager : public DataTypeManagerImpl {
const DataTypeEncryptionHandler* encryption_handler,
DataTypeManagerObserver* observer,
FailedDataTypesHandler* failed_data_types_handler)
- : DataTypeManagerImpl(debug_info_listener,
+ : DataTypeManagerImpl(base::Closure(),
+ debug_info_listener,
controllers,
encryption_handler,
configurer,
@@ -183,8 +182,7 @@ class TestDataTypeManager : public DataTypeManagerImpl {
// run both configuring with nigori, and configuring without).
class SyncDataTypeManagerImplTest : public testing::Test {
public:
- SyncDataTypeManagerImplTest()
- : ui_thread_(content::BrowserThread::UI, &ui_loop_) {}
+ SyncDataTypeManagerImplTest() {}
virtual ~SyncDataTypeManagerImplTest() {
}
@@ -253,7 +251,6 @@ class SyncDataTypeManagerImplTest : public testing::Test {
}
base::MessageLoopForUI ui_loop_;
- content::TestBrowserThread ui_thread_;
DataTypeController::TypeMap controllers_;
FakeBackendDataTypeConfigurer configurer_;
DataTypeManagerObserverMock observer_;
« no previous file with comments | « components/sync_driver/data_type_manager_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698