Index: chrome/browser/custom_handlers/protocol_handler_registry.h |
diff --git a/chrome/browser/custom_handlers/protocol_handler_registry.h b/chrome/browser/custom_handlers/protocol_handler_registry.h |
index edfb7ab6327372f319afaec84e7d5fe26b2650a6..cc26c4a6569430f86d45ab14fc94498a5cc1ee52 100644 |
--- a/chrome/browser/custom_handlers/protocol_handler_registry.h |
+++ b/chrome/browser/custom_handlers/protocol_handler_registry.h |
@@ -12,6 +12,7 @@ |
#include "base/basictypes.h" |
#include "base/memory/ref_counted.h" |
+#include "base/sequenced_task_runner_helpers.h" |
#include "base/values.h" |
#include "chrome/browser/profiles/profile.h" |
#include "chrome/browser/shell_integration.h" |
@@ -84,7 +85,6 @@ class ProtocolHandlerRegistry |
typedef std::vector<DefaultClientObserver*> DefaultClientObserverList; |
ProtocolHandlerRegistry(Profile* profile, Delegate* delegate); |
- ~ProtocolHandlerRegistry(); |
// Called when a site tries to register as a protocol handler. If the request |
// can be handled silently by the registry - either to ignore the request |
@@ -192,7 +192,13 @@ class ProtocolHandlerRegistry |
bool enabled() const { return enabled_; } |
private: |
- friend class base::RefCountedThreadSafe<ProtocolHandlerRegistry>; |
+ friend class base::DeleteHelper<ProtocolHandlerRegistry>; |
+ friend struct content::BrowserThread::DeleteOnThread< |
+ content::BrowserThread::IO>; |
+ friend class ProtocolHandlerRegistryTest; |
+ friend class RegisterProtocolHandlerBrowserTest; |
+ |
+ ~ProtocolHandlerRegistry(); |
// Puts the given handler at the top of the list of handlers for its |
// protocol. |
@@ -249,9 +255,6 @@ class ProtocolHandlerRegistry |
// Ignores future requests to register the given protocol handler. |
void IgnoreProtocolHandler(const ProtocolHandler& handler); |
- // Register |
- void IgnoreHandlerFromValue(const DictionaryValue* value); |
- |
// Map from protocols (strings) to protocol handlers. |
ProtocolHandlerMultiMap protocol_handlers_; |
@@ -282,9 +285,6 @@ class ProtocolHandlerRegistry |
// Copy of default_handlers_ that is only accessed on the IO thread. |
ProtocolHandlerMap default_handlers_io_; |
- friend class ProtocolHandlerRegistryTest; |
- friend class RegisterProtocolHandlerBrowserTest; |
- |
DISALLOW_COPY_AND_ASSIGN(ProtocolHandlerRegistry); |
}; |
#endif // CHROME_BROWSER_CUSTOM_HANDLERS_PROTOCOL_HANDLER_REGISTRY_H_ |