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

Unified Diff: components/sync/device_info/device_info_data_type_controller_unittest.cc

Issue 2388163002: [Sync] Move //components/sync to the syncer namespace, take 2. (Closed)
Patch Set: Rebase. Created 4 years, 2 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/device_info/device_info_data_type_controller_unittest.cc
diff --git a/components/sync/device_info/device_info_data_type_controller_unittest.cc b/components/sync/device_info/device_info_data_type_controller_unittest.cc
index b4c21d8e3aa45530da125dc84db35dad74701d51..5ffd5411ce9d00c4be0fe2126a5f6ab762b1b21f 100644
--- a/components/sync/device_info/device_info_data_type_controller_unittest.cc
+++ b/components/sync/device_info/device_info_data_type_controller_unittest.cc
@@ -15,7 +15,7 @@
#include "components/sync/driver/sync_api_component_factory.h"
#include "testing/gtest/include/gtest/gtest.h"
-namespace sync_driver {
+namespace syncer {
namespace {
@@ -23,7 +23,7 @@ class DeviceInfoDataTypeControllerTest : public testing::Test {
public:
DeviceInfoDataTypeControllerTest()
: load_finished_(false),
- last_type_(syncer::UNSPECIFIED),
+ last_type_(UNSPECIFIED),
weak_ptr_factory_(this) {}
~DeviceInfoDataTypeControllerTest() override {}
@@ -36,8 +36,8 @@ class DeviceInfoDataTypeControllerTest : public testing::Test {
base::Closure(), &sync_client_, local_device_.get()));
load_finished_ = false;
- last_type_ = syncer::UNSPECIFIED;
- last_error_ = syncer::SyncError();
+ last_type_ = UNSPECIFIED;
+ last_error_ = SyncError();
}
void TearDown() override {
@@ -51,7 +51,7 @@ class DeviceInfoDataTypeControllerTest : public testing::Test {
weak_ptr_factory_.GetWeakPtr()));
}
- void OnLoadFinished(syncer::ModelType type, const syncer::SyncError& error) {
+ void OnLoadFinished(ModelType type, const SyncError& error) {
load_finished_ = true;
last_type_ = type;
last_error_ = error;
@@ -68,7 +68,7 @@ class DeviceInfoDataTypeControllerTest : public testing::Test {
<< last_error_.ToString();
}
- if (last_type_ != syncer::DEVICE_INFO) {
+ if (last_type_ != DEVICE_INFO) {
return testing::AssertionFailure()
<< "OnLoadFinished was called with a wrong sync type: "
<< last_type_;
@@ -84,8 +84,8 @@ class DeviceInfoDataTypeControllerTest : public testing::Test {
private:
base::MessageLoopForUI message_loop_;
- syncer::ModelType last_type_;
- syncer::SyncError last_error_;
+ ModelType last_type_;
+ SyncError last_error_;
FakeSyncClient sync_client_;
base::WeakPtrFactory<DeviceInfoDataTypeControllerTest> weak_ptr_factory_;
};
@@ -122,4 +122,4 @@ TEST_F(DeviceInfoDataTypeControllerTest, DestructionWithDelayedStart) {
} // namespace
-} // namespace sync_driver
+} // namespace syncer
« no previous file with comments | « components/sync/device_info/device_info_data_type_controller.cc ('k') | components/sync/device_info/device_info_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698