OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 <string> | 5 #include <string> |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/files/file_util.h" | 9 #include "base/files/file_util.h" |
10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
(...skipping 553 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
564 syncer::SyncDataList list = | 564 syncer::SyncDataList list = |
565 extension_sync_service()->GetAllSyncData(syncer::APPS); | 565 extension_sync_service()->GetAllSyncData(syncer::APPS); |
566 ASSERT_EQ(list.size(), 1U); | 566 ASSERT_EQ(list.size(), 1U); |
567 | 567 |
568 scoped_ptr<ExtensionSyncData> app_sync_data = | 568 scoped_ptr<ExtensionSyncData> app_sync_data = |
569 ExtensionSyncData::CreateFromSyncData(list[0]); | 569 ExtensionSyncData::CreateFromSyncData(list[0]); |
570 EXPECT_TRUE(initial_ordinal.Equals(app_sync_data->app_launch_ordinal())); | 570 EXPECT_TRUE(initial_ordinal.Equals(app_sync_data->app_launch_ordinal())); |
571 EXPECT_TRUE(initial_ordinal.Equals(app_sync_data->page_ordinal())); | 571 EXPECT_TRUE(initial_ordinal.Equals(app_sync_data->page_ordinal())); |
572 } | 572 } |
573 | 573 |
574 AppSorting* sorting = ExtensionPrefs::Get(profile())->app_sorting(); | 574 AppSorting* sorting = ExtensionSystem::Get(profile())->app_sorting(); |
575 sorting->SetAppLaunchOrdinal(app->id(), initial_ordinal.CreateAfter()); | 575 sorting->SetAppLaunchOrdinal(app->id(), initial_ordinal.CreateAfter()); |
576 { | 576 { |
577 syncer::SyncDataList list = | 577 syncer::SyncDataList list = |
578 extension_sync_service()->GetAllSyncData(syncer::APPS); | 578 extension_sync_service()->GetAllSyncData(syncer::APPS); |
579 ASSERT_EQ(list.size(), 1U); | 579 ASSERT_EQ(list.size(), 1U); |
580 | 580 |
581 scoped_ptr<ExtensionSyncData> app_sync_data = | 581 scoped_ptr<ExtensionSyncData> app_sync_data = |
582 ExtensionSyncData::CreateFromSyncData(list[0]); | 582 ExtensionSyncData::CreateFromSyncData(list[0]); |
583 ASSERT_TRUE(app_sync_data.get()); | 583 ASSERT_TRUE(app_sync_data.get()); |
584 EXPECT_TRUE(initial_ordinal.LessThan(app_sync_data->app_launch_ordinal())); | 584 EXPECT_TRUE(initial_ordinal.LessThan(app_sync_data->app_launch_ordinal())); |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
616 } | 616 } |
617 | 617 |
618 syncer::FakeSyncChangeProcessor processor; | 618 syncer::FakeSyncChangeProcessor processor; |
619 extension_sync_service()->MergeDataAndStartSyncing( | 619 extension_sync_service()->MergeDataAndStartSyncing( |
620 syncer::APPS, | 620 syncer::APPS, |
621 syncer::SyncDataList(), | 621 syncer::SyncDataList(), |
622 scoped_ptr<syncer::SyncChangeProcessor>( | 622 scoped_ptr<syncer::SyncChangeProcessor>( |
623 new syncer::FakeSyncChangeProcessor), | 623 new syncer::FakeSyncChangeProcessor), |
624 scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock())); | 624 scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock())); |
625 | 625 |
626 ExtensionPrefs::Get(service()->GetBrowserContext()) | 626 ExtensionSystem::Get(service()->GetBrowserContext()) |
627 ->app_sorting() | 627 ->app_sorting() |
628 ->OnExtensionMoved(apps[0]->id(), apps[1]->id(), apps[2]->id()); | 628 ->OnExtensionMoved(apps[0]->id(), apps[1]->id(), apps[2]->id()); |
629 { | 629 { |
630 syncer::SyncDataList list = | 630 syncer::SyncDataList list = |
631 extension_sync_service()->GetAllSyncData(syncer::APPS); | 631 extension_sync_service()->GetAllSyncData(syncer::APPS); |
632 ASSERT_EQ(list.size(), 3U); | 632 ASSERT_EQ(list.size(), 3U); |
633 | 633 |
634 scoped_ptr<ExtensionSyncData> data[kAppCount]; | 634 scoped_ptr<ExtensionSyncData> data[kAppCount]; |
635 for (size_t i = 0; i < kAppCount; ++i) { | 635 for (size_t i = 0; i < kAppCount; ++i) { |
636 data[i] = ExtensionSyncData::CreateFromSyncData(list[i]); | 636 data[i] = ExtensionSyncData::CreateFromSyncData(list[i]); |
(...skipping 1214 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1851 | 1851 |
1852 extension_sync_service()->ProcessSyncChanges(FROM_HERE, change_list); | 1852 extension_sync_service()->ProcessSyncChanges(FROM_HERE, change_list); |
1853 | 1853 |
1854 EXPECT_TRUE(registry()->enabled_extensions().GetByID(id)); | 1854 EXPECT_TRUE(registry()->enabled_extensions().GetByID(id)); |
1855 EXPECT_FALSE(extensions::util::AllowedScriptingOnAllUrls(id, profile())); | 1855 EXPECT_FALSE(extensions::util::AllowedScriptingOnAllUrls(id, profile())); |
1856 EXPECT_TRUE(extensions::util::HasSetAllowedScriptingOnAllUrls(id, profile())); | 1856 EXPECT_TRUE(extensions::util::HasSetAllowedScriptingOnAllUrls(id, profile())); |
1857 EXPECT_FALSE(extensions::util::AllowedScriptingOnAllUrls(id, profile())); | 1857 EXPECT_FALSE(extensions::util::AllowedScriptingOnAllUrls(id, profile())); |
1858 } | 1858 } |
1859 | 1859 |
1860 #endif // defined(ENABLE_SUPERVISED_USERS) | 1860 #endif // defined(ENABLE_SUPERVISED_USERS) |
OLD | NEW |