Index: chrome/browser/profiles/profile_impl.cc |
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc |
index 7e89356c589e0ef9c207b4caadf9f95d8ad1e065..0981c36b5e0b9aebe0dd9ad52ac9d0d9f20af383 100644 |
--- a/chrome/browser/profiles/profile_impl.cc |
+++ b/chrome/browser/profiles/profile_impl.cc |
@@ -65,6 +65,7 @@ |
#include "chrome/browser/sync/profile_sync_service_factory.h" |
#include "chrome/browser/ui/browser_init.h" |
#include "chrome/browser/ui/webui/extensions/extension_icon_source.h" |
+#include "chrome/browser/usb/usb_service.h" |
#include "chrome/browser/user_style_sheet_watcher.h" |
#include "chrome/browser/visitedlink/visitedlink_event_listener.h" |
#include "chrome/browser/visitedlink/visitedlink_master.h" |
@@ -529,6 +530,10 @@ ProfileImpl::~ProfileImpl() { |
// HistoryService first. |
favicon_service_.reset(); |
+ if (usb_service_.get()) |
+ usb_service_->Cleanup(); |
+ usb_service_.reset(NULL); |
+ |
if (pref_proxy_config_tracker_.get()) |
pref_proxy_config_tracker_->DetachFromPrefService(); |
@@ -663,6 +668,13 @@ bool ProfileImpl::WasCreatedByVersionOrLater(const std::string& version) { |
return (profile_version.CompareTo(arg_version) >= 0); |
} |
+UsbService* ProfileImpl::GetUsbService() { |
+ if (!usb_service_.get()) { |
+ usb_service_.reset(new UsbService()); |
+ } |
+ return usb_service_.get(); |
+} |
+ |
PrefService* ProfileImpl::GetPrefs() { |
DCHECK(prefs_.get()); // Should explicitly be initialized. |
return prefs_.get(); |