| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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.h" | 5 #include "chrome/browser/extensions/extension_service.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <algorithm> | 10 #include <algorithm> |
| (...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 82 #include "chrome/common/extensions/manifest_handlers/content_scripts_handler.h" | 82 #include "chrome/common/extensions/manifest_handlers/content_scripts_handler.h" |
| 83 #include "chrome/common/pref_names.h" | 83 #include "chrome/common/pref_names.h" |
| 84 #include "chrome/common/url_constants.h" | 84 #include "chrome/common/url_constants.h" |
| 85 #include "chrome/grit/browser_resources.h" | 85 #include "chrome/grit/browser_resources.h" |
| 86 #include "chrome/grit/generated_resources.h" | 86 #include "chrome/grit/generated_resources.h" |
| 87 #include "chrome/test/base/scoped_browser_locale.h" | 87 #include "chrome/test/base/scoped_browser_locale.h" |
| 88 #include "chrome/test/base/testing_profile.h" | 88 #include "chrome/test/base/testing_profile.h" |
| 89 #include "components/crx_file/id_util.h" | 89 #include "components/crx_file/id_util.h" |
| 90 #include "components/pref_registry/pref_registry_syncable.h" | 90 #include "components/pref_registry/pref_registry_syncable.h" |
| 91 #include "components/prefs/scoped_user_pref_update.h" | 91 #include "components/prefs/scoped_user_pref_update.h" |
| 92 #include "components/sync/api/string_ordinal.h" | 92 #include "components/sync/model/string_ordinal.h" |
| 93 #include "components/syncable_prefs/pref_service_syncable.h" | 93 #include "components/syncable_prefs/pref_service_syncable.h" |
| 94 #include "components/syncable_prefs/testing_pref_service_syncable.h" | 94 #include "components/syncable_prefs/testing_pref_service_syncable.h" |
| 95 #include "content/public/browser/dom_storage_context.h" | 95 #include "content/public/browser/dom_storage_context.h" |
| 96 #include "content/public/browser/gpu_data_manager.h" | 96 #include "content/public/browser/gpu_data_manager.h" |
| 97 #include "content/public/browser/indexed_db_context.h" | 97 #include "content/public/browser/indexed_db_context.h" |
| 98 #include "content/public/browser/notification_service.h" | 98 #include "content/public/browser/notification_service.h" |
| 99 #include "content/public/browser/plugin_service.h" | 99 #include "content/public/browser/plugin_service.h" |
| 100 #include "content/public/browser/render_process_host.h" | 100 #include "content/public/browser/render_process_host.h" |
| 101 #include "content/public/browser/storage_partition.h" | 101 #include "content/public/browser/storage_partition.h" |
| 102 #include "content/public/common/content_constants.h" | 102 #include "content/public/common/content_constants.h" |
| (...skipping 6836 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6939 ExtensionPrefs* prefs = ExtensionPrefs::Get(profile()); | 6939 ExtensionPrefs* prefs = ExtensionPrefs::Get(profile()); |
| 6940 EXPECT_TRUE(registry()->disabled_extensions().Contains(id)); | 6940 EXPECT_TRUE(registry()->disabled_extensions().Contains(id)); |
| 6941 EXPECT_TRUE(prefs->HasDisableReason(id, Extension::DISABLE_CORRUPTED)); | 6941 EXPECT_TRUE(prefs->HasDisableReason(id, Extension::DISABLE_CORRUPTED)); |
| 6942 | 6942 |
| 6943 base::FilePath v2_path = data_dir().AppendASCII("good2.crx"); | 6943 base::FilePath v2_path = data_dir().AppendASCII("good2.crx"); |
| 6944 UpdateExtension(id, v2_path, ENABLED); | 6944 UpdateExtension(id, v2_path, ENABLED); |
| 6945 | 6945 |
| 6946 EXPECT_FALSE(registry()->disabled_extensions().Contains(id)); | 6946 EXPECT_FALSE(registry()->disabled_extensions().Contains(id)); |
| 6947 EXPECT_FALSE(prefs->HasDisableReason(id, Extension::DISABLE_CORRUPTED)); | 6947 EXPECT_FALSE(prefs->HasDisableReason(id, Extension::DISABLE_CORRUPTED)); |
| 6948 } | 6948 } |
| OLD | NEW |