OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "base/command_line.h" | 5 #include "base/command_line.h" |
6 #include "base/message_loop/message_loop.h" | 6 #include "base/message_loop/message_loop.h" |
7 #include "chrome/browser/profiles/profile.h" | 7 #include "chrome/browser/profiles/profile.h" |
8 #include "chrome/browser/sync/profile_sync_service.h" | 8 #include "chrome/browser/sync/profile_sync_service.h" |
9 #include "chrome/browser/sync/test/integration/bookmarks_helper.h" | 9 #include "chrome/browser/sync/test/integration/bookmarks_helper.h" |
10 #include "chrome/browser/sync/test/integration/sync_integration_test_util.h" | 10 #include "chrome/browser/sync/test/integration/sync_integration_test_util.h" |
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
66 | 66 |
67 bool IsBackupComplete() { | 67 bool IsBackupComplete() { |
68 return pss_->backend_mode() == ProfileSyncService::BACKUP && | 68 return pss_->backend_mode() == ProfileSyncService::BACKUP && |
69 pss_->ShouldPushChanges(); | 69 pss_->ShouldPushChanges(); |
70 } | 70 } |
71 | 71 |
72 ProfileSyncService* pss_; | 72 ProfileSyncService* pss_; |
73 base::TimeTicks expiration_; | 73 base::TimeTicks expiration_; |
74 }; | 74 }; |
75 | 75 |
76 #if defined(OS_WIN) || defined(OS_MACOSX) || (defined(OS_LINUX) && !defined(OS_C
HROMEOS)) | 76 #if defined(ENABLE_PRE_SYNC_BACKUP) |
77 #define MAYBE_TestBackupRollback TestBackupRollback | 77 #define MAYBE_TestBackupRollback TestBackupRollback |
78 #else | 78 #else |
79 #define MAYBE_TestBackupRollback DISABLED_TestBackupRollback | 79 #define MAYBE_TestBackupRollback DISABLED_TestBackupRollback |
80 #endif | 80 #endif |
81 IN_PROC_BROWSER_TEST_F(SingleClientBackupRollbackTest, | 81 IN_PROC_BROWSER_TEST_F(SingleClientBackupRollbackTest, |
82 MAYBE_TestBackupRollback) { | 82 MAYBE_TestBackupRollback) { |
83 ASSERT_TRUE(SetupClients()) << "SetupClients() failed."; | 83 ASSERT_TRUE(SetupClients()) << "SetupClients() failed."; |
84 | 84 |
85 // Starting state: | 85 // Starting state: |
86 // other_node | 86 // other_node |
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
124 | 124 |
125 // Verify bookmarks are restored. | 125 // Verify bookmarks are restored. |
126 ASSERT_EQ(1, tier1_a->child_count()); | 126 ASSERT_EQ(1, tier1_a->child_count()); |
127 const BookmarkNode* url1 = tier1_a->GetChild(0); | 127 const BookmarkNode* url1 = tier1_a->GetChild(0); |
128 ASSERT_EQ(GURL("http://mail.google.com"), url1->url()); | 128 ASSERT_EQ(GURL("http://mail.google.com"), url1->url()); |
129 | 129 |
130 ASSERT_EQ(1, tier1_b->child_count()); | 130 ASSERT_EQ(1, tier1_b->child_count()); |
131 const BookmarkNode* url2 = tier1_b->GetChild(0); | 131 const BookmarkNode* url2 = tier1_b->GetChild(0); |
132 ASSERT_EQ(GURL("http://www.nhl.com"), url2->url()); | 132 ASSERT_EQ(GURL("http://www.nhl.com"), url2->url()); |
133 } | 133 } |
OLD | NEW |