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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: components/browser_sync/profile_sync_service_unittest.cc

Issue 2376123003: [Sync] Move //components/sync to the syncer namespace. (Closed)
Patch Set: Rebase. Created 4 years, 3 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/browser_sync/profile_sync_service_typed_url_unittest.cc ('k') | components/browser_sync/profile_sync_test_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/browser_sync/profile_sync_service_unittest.cc
diff --git a/components/browser_sync/profile_sync_service_unittest.cc b/components/browser_sync/profile_sync_service_unittest.cc
index b0e6a8969313c68a26512ff6809a091f535e80a7..53a47799328080f7f53157c68344abd0c2fdd9bb 100644
--- a/components/browser_sync/profile_sync_service_unittest.cc
+++ b/components/browser_sync/profile_sync_service_unittest.cc
@@ -47,6 +47,7 @@
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/base/l10n/l10n_util.h"
+using syncer::SyncBackendHostMock;
using testing::Return;
namespace browser_sync {
@@ -56,7 +57,7 @@ namespace {
const char kGaiaId[] = "12345";
const char kEmail[] = "test_user@gmail.com";
-class FakeDataTypeManager : public sync_driver::DataTypeManager {
+class FakeDataTypeManager : public syncer::DataTypeManager {
public:
typedef base::Callback<void(syncer::ConfigureReason)> ConfigureCalled;
@@ -76,9 +77,7 @@ class FakeDataTypeManager : public sync_driver::DataTypeManager {
void PurgeForMigration(syncer::ModelTypeSet undesired_types,
syncer::ConfigureReason reason) override {}
void Stop() override{};
- State state() const override {
- return sync_driver::DataTypeManager::CONFIGURED;
- };
+ State state() const override { return syncer::DataTypeManager::CONFIGURED; };
private:
ConfigureCalled configure_called_;
@@ -92,7 +91,7 @@ using testing::Return;
using testing::StrictMock;
using testing::_;
-class TestSyncServiceObserver : public sync_driver::SyncServiceObserver {
+class TestSyncServiceObserver : public syncer::SyncServiceObserver {
public:
explicit TestSyncServiceObserver(ProfileSyncService* service)
: service_(service), setup_in_progress_(false) {}
@@ -111,7 +110,7 @@ class TestSyncServiceObserver : public sync_driver::SyncServiceObserver {
// that could happen while backend init is in progress.
class SyncBackendHostNoReturn : public SyncBackendHostMock {
void Initialize(
- sync_driver::SyncFrontend* frontend,
+ syncer::SyncFrontend* frontend,
std::unique_ptr<base::Thread> sync_thread,
const scoped_refptr<base::SingleThreadTaskRunner>& db_thread,
const scoped_refptr<base::SingleThreadTaskRunner>& file_thread,
@@ -136,7 +135,7 @@ class SyncBackendHostMockCollectDeleteDirParam : public SyncBackendHostMock {
: delete_dir_param_(delete_dir_param) {}
void Initialize(
- sync_driver::SyncFrontend* frontend,
+ syncer::SyncFrontend* frontend,
std::unique_ptr<base::Thread> sync_thread,
const scoped_refptr<base::SingleThreadTaskRunner>& db_thread,
const scoped_refptr<base::SingleThreadTaskRunner>& file_thread,
@@ -248,8 +247,7 @@ class ProfileSyncServiceTest : public ::testing::Test {
service_.reset(new ProfileSyncService(std::move(init_params)));
service_->RegisterDataTypeController(
- base::MakeUnique<sync_driver::FakeDataTypeController>(
- syncer::BOOKMARKS));
+ base::MakeUnique<syncer::FakeDataTypeController>(syncer::BOOKMARKS));
}
#if defined(OS_WIN) || defined(OS_MACOSX) || \
@@ -269,7 +267,7 @@ class ProfileSyncServiceTest : public ::testing::Test {
void InitializeForNthSync() {
// Set first sync time before initialize to simulate a complete sync setup.
- sync_driver::SyncPrefs sync_prefs(prefs());
+ syncer::SyncPrefs sync_prefs(prefs());
sync_prefs.SetFirstSyncTime(base::Time::Now());
sync_prefs.SetFirstSetupComplete();
sync_prefs.SetKeepEverythingSynced(true);
@@ -288,8 +286,8 @@ class ProfileSyncServiceTest : public ::testing::Test {
}
void OnConfigureCalled(syncer::ConfigureReason configure_reason) {
- sync_driver::DataTypeManager::ConfigureResult result;
- result.status = sync_driver::DataTypeManager::OK;
+ syncer::DataTypeManager::ConfigureResult result;
+ result.status = syncer::DataTypeManager::OK;
service()->OnConfigureDone(result);
}
@@ -369,7 +367,7 @@ class ProfileSyncServiceTest : public ::testing::Test {
return profile_sync_service_bundle_.pref_service();
}
- SyncApiComponentFactoryMock* component_factory() {
+ syncer::SyncApiComponentFactoryMock* component_factory() {
return component_factory_;
}
@@ -388,7 +386,7 @@ class ProfileSyncServiceTest : public ::testing::Test {
// The current component factory used by sync. May be null if the server
// hasn't been created yet.
- SyncApiComponentFactoryMock* component_factory_;
+ syncer::SyncApiComponentFactoryMock* component_factory_;
};
// Verify that the server URLs are sane.
@@ -396,13 +394,13 @@ TEST_F(ProfileSyncServiceTest, InitialState) {
CreateService(ProfileSyncService::AUTO_START);
InitializeForNthSync();
const std::string& url = service()->sync_service_url().spec();
- EXPECT_TRUE(url == internal::kSyncServerUrl ||
- url == internal::kSyncDevServerUrl);
+ EXPECT_TRUE(url == syncer::internal::kSyncServerUrl ||
+ url == syncer::internal::kSyncDevServerUrl);
}
// Verify a successful initialization.
TEST_F(ProfileSyncServiceTest, SuccessfulInitialization) {
- prefs()->SetManagedPref(sync_driver::prefs::kSyncManaged,
+ prefs()->SetManagedPref(syncer::prefs::kSyncManaged,
new base::FundamentalValue(false));
IssueTestTokens();
CreateService(ProfileSyncService::AUTO_START);
@@ -416,11 +414,11 @@ TEST_F(ProfileSyncServiceTest, SuccessfulInitialization) {
// Verify that an initialization where first setup is not complete does not
// start up the backend.
TEST_F(ProfileSyncServiceTest, NeedsConfirmation) {
- prefs()->SetManagedPref(sync_driver::prefs::kSyncManaged,
+ prefs()->SetManagedPref(syncer::prefs::kSyncManaged,
new base::FundamentalValue(false));
IssueTestTokens();
CreateService(ProfileSyncService::MANUAL_START);
- sync_driver::SyncPrefs sync_prefs(prefs());
+ syncer::SyncPrefs sync_prefs(prefs());
base::Time now = base::Time::Now();
sync_prefs.SetLastSyncedTime(now);
sync_prefs.SetKeepEverythingSynced(true);
@@ -452,7 +450,7 @@ TEST_F(ProfileSyncServiceTest, SetupInProgress) {
// Verify that disable by enterprise policy works.
TEST_F(ProfileSyncServiceTest, DisabledByPolicyBeforeInit) {
- prefs()->SetManagedPref(sync_driver::prefs::kSyncManaged,
+ prefs()->SetManagedPref(syncer::prefs::kSyncManaged,
new base::FundamentalValue(true));
IssueTestTokens();
CreateService(ProfileSyncService::AUTO_START);
@@ -473,7 +471,7 @@ TEST_F(ProfileSyncServiceTest, DisabledByPolicyAfterInit) {
EXPECT_FALSE(service()->IsManaged());
EXPECT_TRUE(service()->IsSyncActive());
- prefs()->SetManagedPref(sync_driver::prefs::kSyncManaged,
+ prefs()->SetManagedPref(syncer::prefs::kSyncManaged,
new base::FundamentalValue(true));
EXPECT_TRUE(service()->IsManaged());
@@ -523,20 +521,20 @@ TEST_F(ProfileSyncServiceTest, DisableAndEnableSyncTemporarily) {
InitializeForNthSync();
EXPECT_TRUE(service()->IsSyncActive());
- EXPECT_FALSE(prefs()->GetBoolean(sync_driver::prefs::kSyncSuppressStart));
+ EXPECT_FALSE(prefs()->GetBoolean(syncer::prefs::kSyncSuppressStart));
testing::Mock::VerifyAndClearExpectations(component_factory());
service()->RequestStop(ProfileSyncService::KEEP_DATA);
EXPECT_FALSE(service()->IsSyncActive());
- EXPECT_TRUE(prefs()->GetBoolean(sync_driver::prefs::kSyncSuppressStart));
+ EXPECT_TRUE(prefs()->GetBoolean(syncer::prefs::kSyncSuppressStart));
ExpectDataTypeManagerCreation(1, GetDefaultConfigureCalledCallback());
ExpectSyncBackendHostCreation(1);
service()->RequestStart();
EXPECT_TRUE(service()->IsSyncActive());
- EXPECT_FALSE(prefs()->GetBoolean(sync_driver::prefs::kSyncSuppressStart));
+ EXPECT_FALSE(prefs()->GetBoolean(syncer::prefs::kSyncSuppressStart));
}
// Certain ProfileSyncService tests don't apply to Chrome OS, for example
@@ -550,7 +548,7 @@ TEST_F(ProfileSyncServiceTest, EnableSyncAndSignOut) {
InitializeForNthSync();
EXPECT_TRUE(service()->IsSyncActive());
- EXPECT_FALSE(prefs()->GetBoolean(sync_driver::prefs::kSyncSuppressStart));
+ EXPECT_FALSE(prefs()->GetBoolean(syncer::prefs::kSyncSuppressStart));
signin_manager()->SignOut(signin_metrics::SIGNOUT_TEST,
signin_metrics::SignoutDelete::IGNORE_METRIC);
@@ -685,16 +683,14 @@ TEST_F(ProfileSyncServiceTest, MemoryPressureRecording) {
InitializeForNthSync();
EXPECT_TRUE(service()->IsSyncActive());
- EXPECT_FALSE(prefs()->GetBoolean(sync_driver::prefs::kSyncSuppressStart));
+ EXPECT_FALSE(prefs()->GetBoolean(syncer::prefs::kSyncSuppressStart));
testing::Mock::VerifyAndClearExpectations(component_factory());
- sync_driver::SyncPrefs sync_prefs(
- service()->GetSyncClient()->GetPrefService());
+ syncer::SyncPrefs sync_prefs(service()->GetSyncClient()->GetPrefService());
- EXPECT_EQ(
- prefs()->GetInteger(sync_driver::prefs::kSyncMemoryPressureWarningCount),
- 0);
+ EXPECT_EQ(prefs()->GetInteger(syncer::prefs::kSyncMemoryPressureWarningCount),
+ 0);
EXPECT_FALSE(sync_prefs.DidSyncShutdownCleanly());
// Simulate memory pressure notification.
@@ -703,9 +699,8 @@ TEST_F(ProfileSyncServiceTest, MemoryPressureRecording) {
base::RunLoop().RunUntilIdle();
// Verify memory pressure recorded.
- EXPECT_EQ(
- prefs()->GetInteger(sync_driver::prefs::kSyncMemoryPressureWarningCount),
- 1);
+ EXPECT_EQ(prefs()->GetInteger(syncer::prefs::kSyncMemoryPressureWarningCount),
+ 1);
EXPECT_FALSE(sync_prefs.DidSyncShutdownCleanly());
// Simulate memory pressure notification.
@@ -715,9 +710,8 @@ TEST_F(ProfileSyncServiceTest, MemoryPressureRecording) {
ShutdownAndDeleteService();
// Verify memory pressure and shutdown recorded.
- EXPECT_EQ(
- prefs()->GetInteger(sync_driver::prefs::kSyncMemoryPressureWarningCount),
- 2);
+ EXPECT_EQ(prefs()->GetInteger(syncer::prefs::kSyncMemoryPressureWarningCount),
+ 2);
EXPECT_TRUE(sync_prefs.DidSyncShutdownCleanly());
}
@@ -743,8 +737,8 @@ TEST_F(ProfileSyncServiceTest, OnLocalSetPassphraseEncryption) {
EXPECT_TRUE(service()->IsSyncActive());
testing::Mock::VerifyAndClearExpectations(component_factory());
EXPECT_EQ(syncer::CONFIGURE_REASON_NEWLY_ENABLED_DATA_TYPE, configure_reason);
- sync_driver::DataTypeManager::ConfigureResult result;
- result.status = sync_driver::DataTypeManager::OK;
+ syncer::DataTypeManager::ConfigureResult result;
+ result.status = syncer::DataTypeManager::OK;
service()->OnConfigureDone(result);
// Simulate user entering encryption passphrase. Ensure that catch up
@@ -787,8 +781,8 @@ TEST_F(ProfileSyncServiceTest,
InitializeForNthSync();
testing::Mock::VerifyAndClearExpectations(component_factory());
EXPECT_EQ(syncer::CONFIGURE_REASON_NEWLY_ENABLED_DATA_TYPE, configure_reason);
- sync_driver::DataTypeManager::ConfigureResult result;
- result.status = sync_driver::DataTypeManager::OK;
+ syncer::DataTypeManager::ConfigureResult result;
+ result.status = syncer::DataTypeManager::OK;
service()->OnConfigureDone(result);
// Simulate user entering encryption passphrase. Ensure Configure was called
@@ -859,8 +853,8 @@ TEST_F(ProfileSyncServiceTest,
EXPECT_TRUE(captured_callback.is_null());
// Simulate configure successful. This time it should be catch up.
- sync_driver::DataTypeManager::ConfigureResult result;
- result.status = sync_driver::DataTypeManager::OK;
+ syncer::DataTypeManager::ConfigureResult result;
+ result.status = syncer::DataTypeManager::OK;
service()->OnConfigureDone(result);
EXPECT_EQ(syncer::CONFIGURE_REASON_CATCH_UP, configure_reason);
EXPECT_TRUE(captured_callback.is_null());
@@ -887,8 +881,7 @@ TEST_F(ProfileSyncServiceTest, PassphrasePromptDueToVersion) {
ExpectSyncBackendHostCreation(1);
InitializeForNthSync();
- sync_driver::SyncPrefs sync_prefs(
- service()->GetSyncClient()->GetPrefService());
+ syncer::SyncPrefs sync_prefs(service()->GetSyncClient()->GetPrefService());
EXPECT_EQ(PRODUCT_VERSION, sync_prefs.GetLastRunVersion());
sync_prefs.SetPassphrasePrompted(true);
« no previous file with comments | « components/browser_sync/profile_sync_service_typed_url_unittest.cc ('k') | components/browser_sync/profile_sync_test_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698