Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7117)

Unified Diff: chrome/test/base/testing_profile.cc

Issue 13486004: Audio extension API. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address Rahul's comments. Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« chrome/common/extensions/api/audio.idl ('K') | « chrome/test/DEPS ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/base/testing_profile.cc
diff --git a/chrome/test/base/testing_profile.cc b/chrome/test/base/testing_profile.cc
index 92e128693818c64e5c4fefa1a5d13f17dc462ffd..3563ebd5745b6c72a942c4818f053644bd835178 100644
--- a/chrome/test/base/testing_profile.cc
+++ b/chrome/test/base/testing_profile.cc
@@ -77,6 +77,7 @@
#if defined(OS_CHROMEOS)
#include "chrome/browser/chromeos/proxy_config_service_impl.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
#endif // defined(OS_CHROMEOS)
using base::Time;
@@ -272,6 +273,9 @@ void TestingProfile::CreateTempProfileDir() {
}
void TestingProfile::Init() {
+#if defined(OS_CHROMEOS)
+ chromeos::DBusThreadManager::Initialize();
+#endif
if (prefs_.get())
components::UserPrefs::Set(this, prefs_.get());
@@ -302,6 +306,9 @@ void TestingProfile::FinishInit() {
}
TestingProfile::~TestingProfile() {
+#if defined(OS_CHROMEOS)
+ chromeos::DBusThreadManager::Shutdown();
+#endif
MaybeSendDestroyedNotification();
profile_dependency_manager_->DestroyProfileServices(this);
« chrome/common/extensions/api/audio.idl ('K') | « chrome/test/DEPS ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698