[sync] Add backup time in synced device info so that server can flag device

chrome/browser/sync/test/integration/single_client_backup_rollback_test.cc

 // Copyright 2014 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/message_loop/message_loop.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/test/integration/bookmarks_helper.h"
 #include "chrome/browser/sync/test/integration/sync_integration_test_util.h"
 #include "chrome/browser/sync/test/integration/sync_test.h"
 #include "chrome/common/chrome_switches.h"
 #include "components/bookmarks/browser/bookmark_model.h"
+#include "sync/internal_api/public/util/sync_db_util.h"
 #include "sync/test/fake_server/fake_server_verifier.h"
 
 using bookmarks_helper::AddFolder;
 using bookmarks_helper::AddURL;
 using bookmarks_helper::GetOtherNode;
 using bookmarks_helper::ModelMatchesVerifier;
 using bookmarks_helper::Move;
 using bookmarks_helper::Remove;
 using sync_integration_test_util::AwaitCommitActivityCompletion;
 
 class SingleClientBackupRollbackTest : public SyncTest {
  public:
   SingleClientBackupRollbackTest() : SyncTest(SINGLE_CLIENT) {}
   virtual ~SingleClientBackupRollbackTest() {}
 
   virtual void SetUp() OVERRIDE {
     CommandLine::ForCurrentProcess()->AppendSwitch(
           switches::kSyncEnableRollback);
     SyncTest::SetUp();
   }
 
+  base::Time GetBackupDbLastModified() {
+    base::Time backup_time;
+    syncer::CheckSyncDbLastModifiedTime(
+        GetProfile(0)->GetPath().Append(FILE_PATH_LITERAL("Sync Data Backup")),
+        base::MessageLoopProxy::current(),
+        base::Bind(&SingleClientBackupRollbackTest::CheckDbCallback,
+                   base::Unretained(this), &backup_time));
+    base::MessageLoop::current()->RunLoop();

[Nicolas Zea, 2014/06/13 23:48:52]

note: RunLoop is a class, not a method (I don't think this will compile?). See
base/run_loop.h

[haitaol1, 2014/06/16 17:35:28]

really done

On 2014/06/13 23:48:52, Nicolas Zea wrote:

+    return backup_time;
+  }
+
  private:
+  void CheckDbCallback(base::Time* time_out, base::Time time_in) {
+    *time_out = time_in;
+    base::MessageLoop::current()->Quit();
+  }
+
   DISALLOW_COPY_AND_ASSIGN(SingleClientBackupRollbackTest);
 };
 
 class BackupModeChecker {
  public:
   explicit BackupModeChecker(ProfileSyncService* service,
                              base::TimeDelta timeout)
       : pss_(service),
         expiration_(base::TimeTicks::Now() + timeout) {}
 
@@ skipping 50 matching lines @@
                      GURL("http://mail.google.com")));
   ASSERT_TRUE(AddURL(0, tier1_b, 0, "tier1_b_url0",
                      GURL("http://www.nhl.com")));
 
   BackupModeChecker checker(GetSyncService(0),
                             base::TimeDelta::FromSeconds(15));
   ASSERT_TRUE(checker.Wait());
 
   // Setup sync, wait for its completion, and make sure changes were synced.
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
-  ASSERT_TRUE(AwaitCommitActivityCompletion(GetSyncService((0))));
+  ASSERT_TRUE(AwaitCommitActivityCompletion(GetSyncService(0)));
   ASSERT_TRUE(ModelMatchesVerifier(0));
 
   // Made bookmark changes while sync is on.
   Move(0, tier1_a->GetChild(0), tier1_b, 1);
   Remove(0, tier1_b, 0);
   ASSERT_TRUE(AddFolder(0, tier1_b, 1, "tier2_c"));
-  ASSERT_TRUE(AwaitCommitActivityCompletion(GetSyncService((0))));
+  ASSERT_TRUE(AwaitCommitActivityCompletion(GetSyncService(0)));
   ASSERT_TRUE(ModelMatchesVerifier(0));
 
+  // Verify backup time is set on device info.
+  base::Time backup_time = GetBackupDbLastModified();
+  ASSERT_FALSE(backup_time.is_null());
+  ASSERT_EQ(backup_time, GetSyncService(0)->GetDeviceBackupTimeForTesting());
+
   // Let server to return rollback command on next sync request.
   GetFakeServer()->TriggerError(sync_pb::SyncEnums::USER_ROLLBACK);
 
   // Make another change to trigger downloading of rollback command.
   Remove(0, tier1_b, 0);
 
   // Wait for sync to switch to backup mode after finishing rollback.
   ASSERT_TRUE(checker.Wait());
 
   // Verify bookmarks are restored.
   ASSERT_EQ(1, tier1_a->child_count());
   const BookmarkNode* url1 = tier1_a->GetChild(0);
   ASSERT_EQ(GURL("http://mail.google.com"), url1->url());
 
   ASSERT_EQ(1, tier1_b->child_count());
   const BookmarkNode* url2 = tier1_b->GetChild(0);
   ASSERT_EQ(GURL("http://www.nhl.com"), url2->url());
 }