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

Unified Diff: components/sync_driver/non_blocking_data_type_controller_unittest.cc

Issue 408003002: [Sync] Fix namespace for sync_driver component (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 6 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 side-by-side diff with in-line comments
Download patch
Index: components/sync_driver/non_blocking_data_type_controller_unittest.cc
diff --git a/components/sync_driver/non_blocking_data_type_controller_unittest.cc b/components/sync_driver/non_blocking_data_type_controller_unittest.cc
index 9ecd1297bf2ae1b7715c2191f9c683f3849660e2..9cf9489ab3b007e137ed6d71011720cc862c6479 100644
--- a/components/sync_driver/non_blocking_data_type_controller_unittest.cc
+++ b/components/sync_driver/non_blocking_data_type_controller_unittest.cc
@@ -17,19 +17,20 @@
#include "sync/internal_api/public/sync_context_proxy.h"
#include "testing/gtest/include/gtest/gtest.h"
-namespace syncer {
+namespace sync_driver {
class ModelTypeSyncWorker;
namespace {
// A useless instance of ModelTypeSyncWorker.
-class NullModelTypeSyncWorker : public ModelTypeSyncWorker {
+class NullModelTypeSyncWorker : public syncer::ModelTypeSyncWorker {
public:
NullModelTypeSyncWorker();
virtual ~NullModelTypeSyncWorker();
- virtual void EnqueueForCommit(const CommitRequestDataList& list) OVERRIDE;
+ virtual void EnqueueForCommit(
+ const syncer::CommitRequestDataList& list) OVERRIDE;
};
NullModelTypeSyncWorker::NullModelTypeSyncWorker() {
@@ -39,7 +40,7 @@ NullModelTypeSyncWorker::~NullModelTypeSyncWorker() {
}
void NullModelTypeSyncWorker::EnqueueForCommit(
- const CommitRequestDataList& list) {
+ const syncer::CommitRequestDataList& list) {
NOTREACHED() << "Not implemented.";
}
@@ -55,7 +56,7 @@ class MockSyncContext {
FROM_HERE,
base::Bind(&syncer::ModelTypeSyncProxyImpl::OnConnect,
type_proxy,
- base::Passed(scoped_ptr<ModelTypeSyncWorker>(
+ base::Passed(scoped_ptr<syncer::ModelTypeSyncWorker>(
new NullModelTypeSyncWorker()).Pass())));
}
@@ -83,7 +84,7 @@ class MockSyncContextProxy : public syncer::SyncContextProxy {
virtual void ConnectTypeToSync(
syncer::ModelType type,
- const DataTypeState& data_type_state,
+ const syncer::DataTypeState& data_type_state,
const base::WeakPtr<syncer::ModelTypeSyncProxyImpl>& type_proxy)
OVERRIDE {
// Normally we'd use MessageLoopProxy::current() as the TaskRunner argument
@@ -186,7 +187,7 @@ class NonBlockingDataTypeControllerTest : public testing::Test {
scoped_refptr<base::TestSimpleTaskRunner> model_thread_;
scoped_refptr<base::TestSimpleTaskRunner> sync_thread_;
- browser_sync::NonBlockingDataTypeController controller_;
+ NonBlockingDataTypeController controller_;
MockSyncContext mock_sync_context_;
MockSyncContextProxy mock_context_proxy_;
@@ -436,4 +437,4 @@ TEST_F(NonBlockingDataTypeControllerTest, EnableDisableEnableRace) {
EXPECT_TRUE(type_sync_proxy_.IsConnected());
}
-} // namespace syncer
+} // namespace sync_driver
« no previous file with comments | « components/sync_driver/non_blocking_data_type_controller.cc ('k') | components/sync_driver/non_blocking_data_type_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698