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

Side by Side Diff: components/sync/driver/glue/sync_backend_host_impl_unittest.cc

Issue 2518473002: [Sync] Enable SyncBackendHostTest.FirstTimeSync on IOS (Closed)
Patch Set: Created 4 years, 1 month 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "components/sync/driver/glue/sync_backend_host_impl.h" 5 #include "components/sync/driver/glue/sync_backend_host_impl.h"
6 6
7 #include <cstddef> 7 #include <cstddef>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/files/file_util.h" 10 #include "base/files/file_util.h"
(...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after
287 InitializeBackend(true); 287 InitializeBackend(true);
288 EXPECT_EQ(ControlTypes(), fake_manager_->GetAndResetDownloadedTypes()); 288 EXPECT_EQ(ControlTypes(), fake_manager_->GetAndResetDownloadedTypes());
289 EXPECT_EQ(ControlTypes(), fake_manager_->InitialSyncEndedTypes()); 289 EXPECT_EQ(ControlTypes(), fake_manager_->InitialSyncEndedTypes());
290 EXPECT_TRUE( 290 EXPECT_TRUE(
291 fake_manager_->GetTypesWithEmptyProgressMarkerToken(ControlTypes()) 291 fake_manager_->GetTypesWithEmptyProgressMarkerToken(ControlTypes())
292 .Empty()); 292 .Empty());
293 } 293 }
294 294
295 // Test first time sync scenario. All types should be properly configured. 295 // Test first time sync scenario. All types should be properly configured.
296 296
297 #if defined(OS_IOS)
298 // http://crbug.com/658619
299 #define MAYBE_FirstTimeSync DISABLED_FirstTimeSync
300 #else
301 #define MAYBE_FirstTimeSync FirstTimeSync 297 #define MAYBE_FirstTimeSync FirstTimeSync
Nicolas Zea 2016/11/23 00:49:21 nit: just remove this line, and rename the test ba
Gang Wu 2016/11/23 17:34:11 Done.
302 #endif
303 TEST_F(SyncBackendHostTest, MAYBE_FirstTimeSync) { 298 TEST_F(SyncBackendHostTest, MAYBE_FirstTimeSync) {
304 InitializeBackend(true); 299 InitializeBackend(true);
305 EXPECT_EQ(ControlTypes(), fake_manager_->GetAndResetDownloadedTypes()); 300 EXPECT_EQ(ControlTypes(), fake_manager_->GetAndResetDownloadedTypes());
306 EXPECT_EQ(ControlTypes(), fake_manager_->InitialSyncEndedTypes()); 301 EXPECT_EQ(ControlTypes(), fake_manager_->InitialSyncEndedTypes());
307 EXPECT_TRUE( 302 EXPECT_TRUE(
308 fake_manager_->GetTypesWithEmptyProgressMarkerToken(ControlTypes()) 303 fake_manager_->GetTypesWithEmptyProgressMarkerToken(ControlTypes())
309 .Empty()); 304 .Empty());
310 305
311 ModelTypeSet ready_types = ConfigureDataTypes( 306 ModelTypeSet ready_types = ConfigureDataTypes(
312 enabled_types_, Difference(ModelTypeSet::All(), enabled_types_), 307 enabled_types_, Difference(ModelTypeSet::All(), enabled_types_),
(...skipping 517 matching lines...) Expand 10 before | Expand all | Expand 10 after
830 backend_->StopSyncingForShutdown(); 825 backend_->StopSyncingForShutdown();
831 // Verify that call to DeactivateNonBlockingDataType doesn't assert. 826 // Verify that call to DeactivateNonBlockingDataType doesn't assert.
832 backend_->DeactivateNonBlockingDataType(AUTOFILL); 827 backend_->DeactivateNonBlockingDataType(AUTOFILL);
833 backend_->Shutdown(STOP_SYNC); 828 backend_->Shutdown(STOP_SYNC);
834 backend_.reset(); 829 backend_.reset();
835 } 830 }
836 831
837 } // namespace 832 } // namespace
838 833
839 } // namespace syncer 834 } // namespace syncer
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698