Use new sync backup DB if settings are reset to avoid undoing reset.

chrome/browser/sync/profile_sync_service_unittest.cc

 // Copyright (c) 2012 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/basictypes.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
+#include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/invalidation/fake_invalidation_service.h"
 #include "chrome/browser/invalidation/profile_invalidation_provider_factory.h"
 #include "chrome/browser/signin/fake_profile_oauth2_token_service.h"
 #include "chrome/browser/signin/fake_profile_oauth2_token_service_builder.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/sync/glue/sync_backend_host_mock.h"
 #include "chrome/browser/sync/profile_sync_components_factory_mock.h"
@@ skipping 560 matching lines @@
   EXPECT_EQ(ProfileSyncService::BACKUP, service()->backend_mode());
 
   // First sync time is erased once backup starts.
   EXPECT_TRUE(sync_prefs.GetFirstSyncTime().is_null());
 
   EXPECT_EQ(3u, delete_dir_param.size());
   EXPECT_FALSE(delete_dir_param[0]);
   EXPECT_FALSE(delete_dir_param[1]);
   EXPECT_TRUE(delete_dir_param[2]);
 }
+
+TEST_F(ProfileSyncServiceTest, StartNewBackupDbOnSettingsReset) {
+  CreateServiceWithoutSignIn();
+  ExpectDataTypeManagerCreation(1);
+  std::vector<bool> delete_dir_param;
+  ExpectSyncBackendHostCreationCollectDeleteDir(1, &delete_dir_param);
+  Initialize();
+  EXPECT_EQ(ProfileSyncService::IDLE, service()->backend_mode());
+
+  // Set reset time to pretend settings reset happened.
+  profile()->GetPrefs()->SetString(
+      prefs::kPreferenceResetTime,
+      base::Int64ToString(base::Time::Now().ToInternalValue()));
+
+  base::MessageLoop::current()->PostDelayedTask(
+      FROM_HERE,  base::Bind(&QuitLoop),

[gab, 2014/07/08 14:27:06]

Instead of base::Bind(&QuitLoop) these tests should use RunLoop::QuitClosure()
-- which is essentially the same but avoids rolling your own quit closure.

[gab, 2014/07/08 14:27:06]

nit: one space too many after "FROM_HERE,"

[haitaol1, 2014/07/08 20:31:40]

Done.

[haitaol1, 2014/07/08 20:31:40]

Done.

+      base::TimeDelta::FromMilliseconds(100));
+  base::MessageLoop::current()->Run();
+  EXPECT_EQ(ProfileSyncService::BACKUP, service()->backend_mode());
+
+  EXPECT_EQ(1u, delete_dir_param.size());
+  EXPECT_TRUE(delete_dir_param[0]);
+}
+
 #endif
 
 TEST_F(ProfileSyncServiceTest, GetSyncServiceURL) {
   // See that we can override the URL with a flag.
   CommandLine command_line(
       base::FilePath(base::FilePath(FILE_PATH_LITERAL("chrome.exe"))));
   command_line.AppendSwitchASCII(switches::kSyncServiceURL, "https://foo/bar");
   EXPECT_EQ("https://foo/bar",
             ProfileSyncService::GetSyncServiceURL(command_line).spec());
 }
 
 }  // namespace
 }  // namespace browser_sync