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 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
54 #include "chrome/browser/prefs/pref_service_mock_builder.h" | 54 #include "chrome/browser/prefs/pref_service_mock_builder.h" |
55 #include "chrome/browser/prefs/scoped_user_pref_update.h" | 55 #include "chrome/browser/prefs/scoped_user_pref_update.h" |
56 #include "chrome/browser/themes/theme_service_factory.h" | 56 #include "chrome/browser/themes/theme_service_factory.h" |
57 #include "chrome/common/chrome_constants.h" | 57 #include "chrome/common/chrome_constants.h" |
58 #include "chrome/common/chrome_notification_types.h" | 58 #include "chrome/common/chrome_notification_types.h" |
59 #include "chrome/common/chrome_paths.h" | 59 #include "chrome/common/chrome_paths.h" |
60 #include "chrome/common/chrome_switches.h" | 60 #include "chrome/common/chrome_switches.h" |
61 #include "chrome/common/extensions/extension.h" | 61 #include "chrome/common/extensions/extension.h" |
62 #include "chrome/common/extensions/extension_manifest_constants.h" | 62 #include "chrome/common/extensions/extension_manifest_constants.h" |
63 #include "chrome/common/extensions/extension_resource.h" | 63 #include "chrome/common/extensions/extension_resource.h" |
| 64 #include "chrome/common/extensions/permissions/permission_set.h" |
64 #include "chrome/common/extensions/url_pattern.h" | 65 #include "chrome/common/extensions/url_pattern.h" |
65 #include "chrome/common/pref_names.h" | 66 #include "chrome/common/pref_names.h" |
66 #include "chrome/common/string_ordinal.h" | 67 #include "chrome/common/string_ordinal.h" |
67 #include "chrome/common/url_constants.h" | 68 #include "chrome/common/url_constants.h" |
68 #include "chrome/test/base/testing_profile.h" | 69 #include "chrome/test/base/testing_profile.h" |
69 #include "content/public/browser/dom_storage_context.h" | 70 #include "content/public/browser/dom_storage_context.h" |
70 #include "content/public/browser/indexed_db_context.h" | 71 #include "content/public/browser/indexed_db_context.h" |
71 #include "content/public/browser/notification_registrar.h" | 72 #include "content/public/browser/notification_registrar.h" |
72 #include "content/public/browser/notification_service.h" | 73 #include "content/public/browser/notification_service.h" |
73 #include "content/public/browser/plugin_service.h" | 74 #include "content/public/browser/plugin_service.h" |
(...skipping 5167 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
5241 // This should NOT trigger an alert. | 5242 // This should NOT trigger an alert. |
5242 provider->UpdateOrAddExtension(hosted_app, "1.0.0.0", | 5243 provider->UpdateOrAddExtension(hosted_app, "1.0.0.0", |
5243 data_dir_.AppendASCII("hosted_app.crx")); | 5244 data_dir_.AppendASCII("hosted_app.crx")); |
5244 | 5245 |
5245 service_->CheckForExternalUpdates(); | 5246 service_->CheckForExternalUpdates(); |
5246 loop_.RunAllPending(); | 5247 loop_.RunAllPending(); |
5247 | 5248 |
5248 ASSERT_TRUE(service_->PopulateExtensionErrorUI(extension_error_ui.get())); | 5249 ASSERT_TRUE(service_->PopulateExtensionErrorUI(extension_error_ui.get())); |
5249 ASSERT_EQ(1u, extension_error_ui->get_external_extension_ids()->size()); | 5250 ASSERT_EQ(1u, extension_error_ui->get_external_extension_ids()->size()); |
5250 } | 5251 } |
OLD | NEW |