2 files changed, 38 insertions, 0 deletions
diff --git a/chrome/browser/sync/profile_sync_service_factory_unittest.cc b/chrome/browser/sync/profile_sync_service_factory_unittest.cc
new file mode 100644
index 0000000..e3c2da1
--- /dev/null
+++ b/chrome/browser/sync/profile_sync_service_factory_unittest.cc
@@ -0,0 +1,27 @@
+// Copyright (c) 2015 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "base/command_line.h"
+#include "base/memory/scoped_ptr.h"
+#include "chrome/browser/sync/profile_sync_service_factory.h"
+#include "chrome/common/chrome_switches.h"
+#include "chrome/test/base/testing_profile.h"
+#include "testing/gtest/include/gtest/gtest.h"
+
+class ProfileSyncServiceFactoryTest : public testing::Test {
+ protected:
+  ProfileSyncServiceFactoryTest() {}
+
+  void SetUp() override {
+    profile_.reset(new TestingProfile());
+  }
+
+  scoped_ptr<Profile> profile_;
+};
+
+// Verify that the disable sync flag disables creation of the sync service.
+TEST_F(ProfileSyncServiceFactoryTest, DisableSyncFlag) {
+  base::CommandLine::ForCurrentProcess()->AppendSwitch(switches::kDisableSync);
+  EXPECT_EQ(nullptr, ProfileSyncServiceFactory::GetForProfile(profile_.get()));
+}
diff --git a/chrome/browser/sync/profile_sync_service_unittest.cc b/chrome/browser/sync/profile_sync_service_unittest.cc
index 566b369..044542c 100644
--- a/chrome/browser/sync/profile_sync_service_unittest.cc
+++ b/chrome/browser/sync/profile_sync_service_unittest.cc
@@ -639,5 +639,16 @@ TEST_F(ProfileSyncServiceTest, ClearLastSyncedTimeOnSignOut) {
             service()->GetLastSyncedTimeString());
 }
 
+// Verify that the disable sync flag disables sync.
+TEST_F(ProfileSyncServiceTest, DisableSyncFlag) {
+  base::CommandLine::ForCurrentProcess()->AppendSwitch(switches::kDisableSync);
+  EXPECT_FALSE(ProfileSyncService::IsSyncEnabled());
+}
+
+// Verify that no disable sync flag enables sync.
+TEST_F(ProfileSyncServiceTest, NoDisableSyncFlag) {
+  EXPECT_TRUE(ProfileSyncService::IsSyncEnabled());
+}
+
 }  // namespace
 }  // namespace browser_sync