| 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/custom_handlers/protocol_handler_registry.h" | 5 #include "chrome/browser/custom_handlers/protocol_handler_registry.h" |
| 6 | 6 |
| 7 #include <stddef.h> |
| 8 |
| 7 #include <set> | 9 #include <set> |
| 8 | 10 |
| 9 #include "base/memory/scoped_ptr.h" | 11 #include "base/memory/scoped_ptr.h" |
| 10 #include "base/message_loop/message_loop.h" | 12 #include "base/message_loop/message_loop.h" |
| 11 #include "base/strings/utf_string_conversions.h" | 13 #include "base/strings/utf_string_conversions.h" |
| 12 #include "base/synchronization/waitable_event.h" | 14 #include "base/synchronization/waitable_event.h" |
| 15 #include "build/build_config.h" |
| 13 #include "chrome/browser/chrome_notification_types.h" | 16 #include "chrome/browser/chrome_notification_types.h" |
| 14 #include "chrome/common/custom_handlers/protocol_handler.h" | 17 #include "chrome/common/custom_handlers/protocol_handler.h" |
| 15 #include "chrome/common/pref_names.h" | 18 #include "chrome/common/pref_names.h" |
| 16 #include "chrome/test/base/testing_browser_process.h" | 19 #include "chrome/test/base/testing_browser_process.h" |
| 17 #include "chrome/test/base/testing_profile.h" | 20 #include "chrome/test/base/testing_profile.h" |
| 18 #include "components/pref_registry/pref_registry_syncable.h" | 21 #include "components/pref_registry/pref_registry_syncable.h" |
| 19 #include "components/syncable_prefs/pref_service_syncable.h" | 22 #include "components/syncable_prefs/pref_service_syncable.h" |
| 20 #include "content/public/browser/notification_observer.h" | 23 #include "content/public/browser/notification_observer.h" |
| 21 #include "content/public/browser/notification_registrar.h" | 24 #include "content/public/browser/notification_registrar.h" |
| 22 #include "content/public/browser/notification_source.h" | 25 #include "content/public/browser/notification_source.h" |
| (...skipping 1076 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1099 // added to pref. | 1102 // added to pref. |
| 1100 ASSERT_EQ(InPrefIgnoredHandlerCount(), 2); | 1103 ASSERT_EQ(InPrefIgnoredHandlerCount(), 2); |
| 1101 ASSERT_EQ(InMemoryIgnoredHandlerCount(), 4); | 1104 ASSERT_EQ(InMemoryIgnoredHandlerCount(), 4); |
| 1102 | 1105 |
| 1103 registry()->RemoveIgnoredHandler(p2u1); | 1106 registry()->RemoveIgnoredHandler(p2u1); |
| 1104 | 1107 |
| 1105 // p2u1 installed by user and policy, so it is removed from pref alone. | 1108 // p2u1 installed by user and policy, so it is removed from pref alone. |
| 1106 ASSERT_EQ(InPrefIgnoredHandlerCount(), 1); | 1109 ASSERT_EQ(InPrefIgnoredHandlerCount(), 1); |
| 1107 ASSERT_EQ(InMemoryIgnoredHandlerCount(), 4); | 1110 ASSERT_EQ(InMemoryIgnoredHandlerCount(), 4); |
| 1108 } | 1111 } |
| OLD | NEW |