OLD | NEW |
1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 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/compiler_specific.h" | 5 #include "base/compiler_specific.h" |
6 #include "base/memory/scoped_vector.h" | 6 #include "base/memory/scoped_vector.h" |
7 #include "base/prefs/scoped_user_pref_update.h" | 7 #include "base/prefs/scoped_user_pref_update.h" |
8 #include "chrome/browser/profiles/profile.h" | 8 #include "chrome/browser/profiles/profile.h" |
9 #include "chrome/browser/sync/backend_migrator.h" | 9 #include "chrome/browser/sync/backend_migrator.h" |
10 #include "chrome/browser/sync/test/integration/bookmarks_helper.h" | 10 #include "chrome/browser/sync/test/integration/bookmarks_helper.h" |
(...skipping 497 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
508 ASSERT_GE(migration_list.size(), 2u); | 508 ASSERT_GE(migration_list.size(), 2u); |
509 ASSERT_FALSE(migration_list.back().Equals(MakeSet(syncer::NIGORI))); | 509 ASSERT_FALSE(migration_list.back().Equals(MakeSet(syncer::NIGORI))); |
510 migration_list.back() = MakeSet(syncer::NIGORI); | 510 migration_list.back() = MakeSet(syncer::NIGORI); |
511 RunTwoClientMigrationTest(migration_list, MODIFY_BOOKMARK); | 511 RunTwoClientMigrationTest(migration_list, MODIFY_BOOKMARK); |
512 } | 512 } |
513 | 513 |
514 class MigrationReconfigureTest : public MigrationTwoClientTest { | 514 class MigrationReconfigureTest : public MigrationTwoClientTest { |
515 public: | 515 public: |
516 MigrationReconfigureTest() {} | 516 MigrationReconfigureTest() {} |
517 | 517 |
518 virtual void SetUpCommandLine(CommandLine* cl) OVERRIDE { | 518 virtual void SetUpCommandLine(base::CommandLine* cl) OVERRIDE { |
519 AddTestSwitches(cl); | 519 AddTestSwitches(cl); |
520 // Do not add optional datatypes. | 520 // Do not add optional datatypes. |
521 } | 521 } |
522 | 522 |
523 virtual ~MigrationReconfigureTest() {} | 523 virtual ~MigrationReconfigureTest() {} |
524 | 524 |
525 private: | 525 private: |
526 DISALLOW_COPY_AND_ASSIGN(MigrationReconfigureTest); | 526 DISALLOW_COPY_AND_ASSIGN(MigrationReconfigureTest); |
527 }; | 527 }; |
528 | 528 |
529 } // namespace | 529 } // namespace |
OLD | NEW |