| 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 4120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4131 install_dir, | 4131 install_dir, |
| 4132 false); | 4132 false); |
| 4133 EXPECT_FALSE(service->extensions_enabled()); | 4133 EXPECT_FALSE(service->extensions_enabled()); |
| 4134 service->Init(); | 4134 service->Init(); |
| 4135 loop.RunAllPending(); | 4135 loop.RunAllPending(); |
| 4136 EXPECT_TRUE(recorder.ready()); | 4136 EXPECT_TRUE(recorder.ready()); |
| 4137 | 4137 |
| 4138 // Explicitly delete all the resources used in this test. | 4138 // Explicitly delete all the resources used in this test. |
| 4139 profile.reset(); | 4139 profile.reset(); |
| 4140 service = NULL; | 4140 service = NULL; |
| 4141 // Execute any pending deletion tasks. |
| 4142 loop.RunAllPending(); |
| 4141 } | 4143 } |
| 4142 | 4144 |
| 4143 // Test loading extensions that require limited and unlimited storage quotas. | 4145 // Test loading extensions that require limited and unlimited storage quotas. |
| 4144 TEST_F(ExtensionServiceTest, StorageQuota) { | 4146 TEST_F(ExtensionServiceTest, StorageQuota) { |
| 4145 InitializeEmptyExtensionService(); | 4147 InitializeEmptyExtensionService(); |
| 4146 | 4148 |
| 4147 FilePath extensions_path = data_dir_ | 4149 FilePath extensions_path = data_dir_ |
| 4148 .AppendASCII("storage_quota"); | 4150 .AppendASCII("storage_quota"); |
| 4149 | 4151 |
| 4150 FilePath limited_quota_ext = | 4152 FilePath limited_quota_ext = |
| (...skipping 1084 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5235 // This should NOT trigger an alert. | 5237 // This should NOT trigger an alert. |
| 5236 provider->UpdateOrAddExtension(hosted_app, "1.0.0.0", | 5238 provider->UpdateOrAddExtension(hosted_app, "1.0.0.0", |
| 5237 data_dir_.AppendASCII("hosted_app.crx")); | 5239 data_dir_.AppendASCII("hosted_app.crx")); |
| 5238 | 5240 |
| 5239 service_->CheckForExternalUpdates(); | 5241 service_->CheckForExternalUpdates(); |
| 5240 loop_.RunAllPending(); | 5242 loop_.RunAllPending(); |
| 5241 | 5243 |
| 5242 ASSERT_TRUE(service_->PopulateExtensionErrorUI(extension_error_ui.get())); | 5244 ASSERT_TRUE(service_->PopulateExtensionErrorUI(extension_error_ui.get())); |
| 5243 ASSERT_EQ(1u, extension_error_ui->get_external_extension_ids()->size()); | 5245 ASSERT_EQ(1u, extension_error_ui->get_external_extension_ids()->size()); |
| 5244 } | 5246 } |
| OLD | NEW |