Adding UsbService and UsbDevice constructs.

chrome/browser/profiles/profile_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/profiles/profile_impl.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/environment.h"
@@ skipping 80 matching lines @@
 #include "chrome/browser/chromeos/enterprise_extension_observer.h"
 #endif
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/locale_change_guard.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/preferences.h"
 #include "chrome/browser/chromeos/proxy_config_service_impl.h"
 #endif
 
+#if !defined(OS_ANDROID)
+#include "chrome/browser/usb/usb_service.h"
+#endif  // !defined(OS_ANDROID)

[miket_OOO, 2012/04/25 21:24:36]

This include approximately duplicates the one in the .h.

+
 using base::Time;
 using base::TimeDelta;
 using content::BrowserThread;
 using content::DownloadManager;
 using content::HostZoomMap;
 using content::UserMetricsAction;
 
 namespace {
 
 // Constrict us to a very specific platform and architecture to make sure
@@ skipping 411 matching lines @@
   // HistoryService will join with HistoryService's backend thread so that
   // by the time the destructor has finished we're sure it will no longer call
   // into the BookmarkModel.
   history_service_ = NULL;
   bookmark_bar_model_.reset();
 
   // FaviconService depends on HistoryServce so make sure we delete
   // HistoryService first.
   favicon_service_.reset();
 
+  if (usb_service_.get())
+    usb_service_->Cleanup();
+  usb_service_.reset(NULL);

[miket_OOO, 2012/04/25 21:24:36]

Might as well put the reset inside the block. A few dozen nanoseconds faster on
Android.

+
   if (pref_proxy_config_tracker_.get())
     pref_proxy_config_tracker_->DetachFromPrefService();
 
   if (protocol_handler_registry_)
     protocol_handler_registry_->Finalize();
 
   if (host_content_settings_map_)
     host_content_settings_map_->ShutdownOnUIThread();
 
   // This causes the Preferences file to be written to disk.
@@ skipping 114 matching lines @@
   ChromeVersionService::OnProfileLoaded(prefs_.get(), is_new_profile);
   DoFinalInit(is_new_profile);
 }
 
 bool ProfileImpl::WasCreatedByVersionOrLater(const std::string& version) {
   Version profile_version(ChromeVersionService::GetVersion(prefs_.get()));
   Version arg_version(version);
   return (profile_version.CompareTo(arg_version) >= 0);
 }
 
+#if !defined(OS_ANDROID)
+UsbService* ProfileImpl::GetUsbService() {
+  if (!usb_service_.get()) {
+    usb_service_.reset(new UsbService());
+  }
+  return usb_service_.get();
+}
+#endif  // !defined(OS_ANDROID)
+
 PrefService* ProfileImpl::GetPrefs() {
   DCHECK(prefs_.get());  // Should explicitly be initialized.
   return prefs_.get();
 }
 
 PrefService* ProfileImpl::GetOffTheRecordPrefs() {
   if (!otr_prefs_.get()) {
     // The new ExtensionPrefStore is ref_counted and the new PrefService
     // stores a reference so that we do not leak memory here.
     otr_prefs_.reset(GetPrefs()->CreateIncognitoPrefService(
@@ skipping 482 matching lines @@
   if (!path.empty())
     *cache_path = path;
   *max_size = is_media_context ? prefs_->GetInteger(prefs::kMediaCacheSize) :
                                  prefs_->GetInteger(prefs::kDiskCacheSize);
 }
 
 base::Callback<ChromeURLDataManagerBackend*(void)>
     ProfileImpl::GetChromeURLDataManagerBackendGetter() const {
   return io_data_.GetChromeURLDataManagerBackendGetter();
 }