OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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 "chrome/browser/extensions/extension_service_unittest.h" | 5 #include "chrome/browser/extensions/extension_service_unittest.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <set> | 8 #include <set> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 4101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4112 | 4112 |
4113 StringOrdinal initial_ordinal = StringOrdinal::CreateInitialOrdinal(); | 4113 StringOrdinal initial_ordinal = StringOrdinal::CreateInitialOrdinal(); |
4114 { | 4114 { |
4115 SyncDataList list = service_->GetAllSyncData(syncable::APPS); | 4115 SyncDataList list = service_->GetAllSyncData(syncable::APPS); |
4116 ASSERT_EQ(list.size(), 1U); | 4116 ASSERT_EQ(list.size(), 1U); |
4117 ExtensionSyncData data(list[0]); | 4117 ExtensionSyncData data(list[0]); |
4118 EXPECT_TRUE(initial_ordinal.Equal(data.app_launch_ordinal())); | 4118 EXPECT_TRUE(initial_ordinal.Equal(data.app_launch_ordinal())); |
4119 EXPECT_TRUE(initial_ordinal.Equal(data.page_ordinal())); | 4119 EXPECT_TRUE(initial_ordinal.Equal(data.page_ordinal())); |
4120 } | 4120 } |
4121 | 4121 |
4122 service_->SetAppLaunchOrdinal(app->id(), initial_ordinal.CreateAfter()); | 4122 ExtensionSorting* sorting = service_->extension_prefs()->extension_sorting(); |
| 4123 sorting->SetAppLaunchOrdinal(app->id(), initial_ordinal.CreateAfter()); |
4123 { | 4124 { |
4124 SyncDataList list = service_->GetAllSyncData(syncable::APPS); | 4125 SyncDataList list = service_->GetAllSyncData(syncable::APPS); |
4125 ASSERT_EQ(list.size(), 1U); | 4126 ASSERT_EQ(list.size(), 1U); |
4126 ExtensionSyncData data(list[0]); | 4127 ExtensionSyncData data(list[0]); |
4127 EXPECT_TRUE(initial_ordinal.LessThan(data.app_launch_ordinal())); | 4128 EXPECT_TRUE(initial_ordinal.LessThan(data.app_launch_ordinal())); |
4128 EXPECT_TRUE(initial_ordinal.Equal(data.page_ordinal())); | 4129 EXPECT_TRUE(initial_ordinal.Equal(data.page_ordinal())); |
4129 } | 4130 } |
4130 | 4131 |
4131 service_->SetPageOrdinal(app->id(), initial_ordinal.CreateAfter()); | 4132 sorting->SetPageOrdinal(app->id(), initial_ordinal.CreateAfter()); |
4132 { | 4133 { |
4133 SyncDataList list = service_->GetAllSyncData(syncable::APPS); | 4134 SyncDataList list = service_->GetAllSyncData(syncable::APPS); |
4134 ASSERT_EQ(list.size(), 1U); | 4135 ASSERT_EQ(list.size(), 1U); |
4135 ExtensionSyncData data(list[0]); | 4136 ExtensionSyncData data(list[0]); |
4136 EXPECT_TRUE(initial_ordinal.LessThan(data.app_launch_ordinal())); | 4137 EXPECT_TRUE(initial_ordinal.LessThan(data.app_launch_ordinal())); |
4137 EXPECT_TRUE(initial_ordinal.LessThan(data.page_ordinal())); | 4138 EXPECT_TRUE(initial_ordinal.LessThan(data.page_ordinal())); |
4138 } | 4139 } |
4139 } | 4140 } |
4140 | 4141 |
4141 TEST_F(ExtensionServiceTest, GetSyncAppDataUserSettingsOnExtensionMoved) { | 4142 TEST_F(ExtensionServiceTest, GetSyncAppDataUserSettingsOnExtensionMoved) { |
(...skipping 715 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4857 provider->UpdateOrAddExtension(hosted_app, "1.0.0.0", | 4858 provider->UpdateOrAddExtension(hosted_app, "1.0.0.0", |
4858 data_dir_.AppendASCII("hosted_app.crx")); | 4859 data_dir_.AppendASCII("hosted_app.crx")); |
4859 | 4860 |
4860 service_->CheckForExternalUpdates(); | 4861 service_->CheckForExternalUpdates(); |
4861 loop_.RunAllPending(); | 4862 loop_.RunAllPending(); |
4862 | 4863 |
4863 ASSERT_TRUE(service_->PopulateExtensionGlobalError( | 4864 ASSERT_TRUE(service_->PopulateExtensionGlobalError( |
4864 extension_global_error.get())); | 4865 extension_global_error.get())); |
4865 ASSERT_EQ(1u, extension_global_error->get_external_extension_ids()->size()); | 4866 ASSERT_EQ(1u, extension_global_error->get_external_extension_ids()->size()); |
4866 } | 4867 } |
OLD | NEW |