diff options
10 files changed, 22 insertions, 12 deletions
diff --git a/chrome/browser/debugger/debugger_remote_service.h b/chrome/browser/debugger/debugger_remote_service.h index b43ba48..7f6e4e8 100644 --- a/chrome/browser/debugger/debugger_remote_service.h +++ b/chrome/browser/debugger/debugger_remote_service.h @@ -40,7 +40,6 @@ class DebuggerRemoteService : public DevToolsRemoteListener { // V8 VM debugger are routed back to |delegate|. // The ownership of |delegate| is NOT transferred to this class. explicit DebuggerRemoteService(DevToolsProtocolHandler* delegate); - virtual ~DebuggerRemoteService(); // Handles a JSON message from the tab_uid-associated V8 debugger. void DebuggerOutput(int32 tab_uid, const std::string& message); @@ -84,6 +83,8 @@ class DebuggerRemoteService : public DevToolsRemoteListener { RESULT_UNKNOWN_COMMAND } Result; + virtual ~DebuggerRemoteService(); + // Attaches a remote debugger to the tab specified by |destination|. // Writes the attachment result (one of Result enum values) into |response|. void AttachToTab(const std::string& destination, diff --git a/chrome/browser/debugger/devtools_protocol_handler.h b/chrome/browser/debugger/devtools_protocol_handler.h index 41b2869..8c14a82 100644 --- a/chrome/browser/debugger/devtools_protocol_handler.h +++ b/chrome/browser/debugger/devtools_protocol_handler.h @@ -28,7 +28,6 @@ class DevToolsProtocolHandler ToolToListenerMap; explicit DevToolsProtocolHandler(int port); - virtual ~DevToolsProtocolHandler(); // This method should be called after the object construction. void Start(); @@ -66,6 +65,8 @@ class DevToolsProtocolHandler virtual void DidClose(ListenSocket *sock); private: + virtual ~DevToolsProtocolHandler(); + void Init(); void Teardown(); int port_; diff --git a/chrome/browser/debugger/devtools_remote_listen_socket_unittest.h b/chrome/browser/debugger/devtools_remote_listen_socket_unittest.h index 0ec0501..374df13 100644 --- a/chrome/browser/debugger/devtools_remote_listen_socket_unittest.h +++ b/chrome/browser/debugger/devtools_remote_listen_socket_unittest.h @@ -91,9 +91,6 @@ class DevToolsRemoteListenSocketTester : memset(&lock_, 0, sizeof(lock_)); } - virtual ~DevToolsRemoteListenSocketTester() { - } - virtual void SetUp(); virtual void TearDown(); @@ -138,6 +135,9 @@ class DevToolsRemoteListenSocketTester : protected: virtual ListenSocket* DoListen(); + + private: + virtual ~DevToolsRemoteListenSocketTester() {} }; #endif // CHROME_BROWSER_DEBUGGER_DEVTOOLS_REMOTE_LISTEN_SOCKET_UNITTEST_H_ diff --git a/chrome/browser/debugger/devtools_remote_service.h b/chrome/browser/debugger/devtools_remote_service.h index 5a4f3cd..68518ef 100644 --- a/chrome/browser/debugger/devtools_remote_service.h +++ b/chrome/browser/debugger/devtools_remote_service.h @@ -26,7 +26,6 @@ struct DevToolsRemoteServiceCommand { class DevToolsRemoteService : public DevToolsRemoteListener { public: explicit DevToolsRemoteService(DevToolsProtocolHandler* delegate); - virtual ~DevToolsRemoteService(); // DevToolsRemoteListener interface virtual void HandleMessage(const DevToolsRemoteMessage& message); @@ -40,6 +39,7 @@ class DevToolsRemoteService : public DevToolsRemoteListener { static const int kOk = 0; static const int kUnknownCommand = 1; }; + virtual ~DevToolsRemoteService(); void ProcessJson(DictionaryValue* json, const DevToolsRemoteMessage& message); static const std::wstring kCommandWide; static const std::wstring kDataWide; diff --git a/chrome/browser/debugger/extension_ports_remote_service.h b/chrome/browser/debugger/extension_ports_remote_service.h index 8d14e3d..005905c 100644 --- a/chrome/browser/debugger/extension_ports_remote_service.h +++ b/chrome/browser/debugger/extension_ports_remote_service.h @@ -34,7 +34,6 @@ class ExtensionPortsRemoteService : public DevToolsRemoteListener, // dispatches messages to this service. // The ownership of |delegate| is NOT transferred to this class. explicit ExtensionPortsRemoteService(DevToolsProtocolHandler* delegate); - virtual ~ExtensionPortsRemoteService(); // DevToolsRemoteListener methods: @@ -65,6 +64,8 @@ class ExtensionPortsRemoteService : public DevToolsRemoteListener, RESULT_CONNECT_FAILED, // probably extension ID not found. } Result; + virtual ~ExtensionPortsRemoteService(); + // Sends a JSON message with the |response| to the external client. // |tool| and |destination| are used as the respective header values. void SendResponse(const Value& response, diff --git a/chrome/browser/extensions/extension_updater.cc b/chrome/browser/extensions/extension_updater.cc index 28958be..58f4ac2 100644 --- a/chrome/browser/extensions/extension_updater.cc +++ b/chrome/browser/extensions/extension_updater.cc @@ -215,8 +215,6 @@ class SafeManifestParser : public UtilityProcessHost::Client { : xml_(xml), updater_(updater) { } - ~SafeManifestParser() {} - // Posts a task over to the IO loop to start the parsing of xml_ in a // utility process. void Start() { @@ -279,6 +277,8 @@ class SafeManifestParser : public UtilityProcessHost::Client { } private: + ~SafeManifestParser() {} + const std::string& xml_; scoped_refptr<ExtensionUpdater> updater_; @@ -469,7 +469,7 @@ void ExtensionUpdater::TimerFired() { kLastExtensionsUpdateCheck)); if (last.ToInternalValue() != 0) { // Use counts rather than time so we can use minutes rather than millis. - UMA_HISTOGRAM_CUSTOM_COUNTS("Extensions.UpdateCheckGap", + UMA_HISTOGRAM_CUSTOM_COUNTS("Extensions.UpdateCheckGap", (Time::Now() - last).InMinutes(), base::TimeDelta::FromSeconds(kStartupWaitSeconds).InMinutes(), base::TimeDelta::FromDays(40).InMinutes(), diff --git a/chrome/browser/extensions/sandboxed_extension_unpacker.h b/chrome/browser/extensions/sandboxed_extension_unpacker.h index b5f1741..06edcbe 100644 --- a/chrome/browser/extensions/sandboxed_extension_unpacker.h +++ b/chrome/browser/extensions/sandboxed_extension_unpacker.h @@ -103,6 +103,8 @@ class SandboxedExtensionUnpacker : public UtilityProcessHost::Client { class ProcessHostClient; friend class ProcessHostClient; + ~SandboxedExtensionUnpacker() {} + // Validates the signature of the extension and extract the key to // |public_key_|. Returns true if the signature validates, false otherwise. // diff --git a/chrome/browser/utility_process_host_unittest.cc b/chrome/browser/utility_process_host_unittest.cc index 3be0480..950c596 100644 --- a/chrome/browser/utility_process_host_unittest.cc +++ b/chrome/browser/utility_process_host_unittest.cc @@ -66,6 +66,8 @@ class TestUtilityProcessHostClient : public UtilityProcessHost::Client { } private: + ~TestUtilityProcessHostClient() {} + bool success_; }; diff --git a/chrome/browser/web_resource/web_resource_service.cc b/chrome/browser/web_resource/web_resource_service.cc index 80805f2..a3e4ae4 100644 --- a/chrome/browser/web_resource/web_resource_service.cc +++ b/chrome/browser/web_resource/web_resource_service.cc @@ -87,7 +87,7 @@ class WebResourceService::WebResourceFetcher scoped_ptr<URLFetcher> url_fetcher_; // Our owner and creator. - scoped_ptr<WebResourceService> web_resource_service_; + scoped_refptr<WebResourceService> web_resource_service_; }; // This class coordinates a web resource unpack and parse task which is run in @@ -136,6 +136,8 @@ class WebResourceService::UnpackerClient } private: + ~UnpackerClient() {} + // UtilityProcessHost::Client virtual void OnProcessCrashed() { if (got_response_) diff --git a/chrome/browser/web_resource/web_resource_service.h b/chrome/browser/web_resource/web_resource_service.h index 14c04cf..8a0289e 100644 --- a/chrome/browser/web_resource/web_resource_service.h +++ b/chrome/browser/web_resource/web_resource_service.h @@ -17,7 +17,6 @@ class WebResourceService : public UtilityProcessHost::Client { public: WebResourceService(Profile* profile); - ~WebResourceService(); // Sleep until cache needs to be updated, but always for at least 5 seconds // so we don't interfere with startup. Then begin updating resources. @@ -43,6 +42,8 @@ class WebResourceService class UnpackerClient; + ~WebResourceService(); + void Init(); // Set in_fetch_ to false, clean up temp directories (in the future). |