Make content_shell and content_browsertests working with aura

content/test/content_browser_test.cc

Index: content/test/content_browser_test.cc
diff --git a/content/test/content_browser_test.cc b/content/test/content_browser_test.cc
index ff2bfd2d966fe919e9013f3b62ef3b52da6bb9d6..0c55d0a0105550d920f46cf6877290685c1fc8b2 100644
--- a/content/test/content_browser_test.cc
+++ b/content/test/content_browser_test.cc
@@ -17,6 +17,10 @@
 #include "content/shell/shell_switches.h"
 #include "content/test/test_content_client.h"
 
+#if defined(OS_CHROMEOS)
+#include "chromeos/dbus/mock_dbus_thread_manager.h"
+#endif
+
 #if defined(OS_MACOSX)
 #include "base/mac/scoped_nsautorelease_pool.h"
 #endif
@@ -39,6 +43,12 @@ ContentBrowserTest::~ContentBrowserTest() {
 }
 
 void ContentBrowserTest::SetUp() {
+#if defined(OS_CHROMEOS)
+  chromeos::MockDBusThreadManager* mock_dbus_thread_manager =
+      new chromeos::MockDBusThreadManager;
+  chromeos::DBusThreadManager::InitializeForTesting(mock_dbus_thread_manager);

[jam, 2012/07/25 16:29:02]

a CrOS person should maybe look at this, but are you sure that you want to use
this mock dbus manager?

http://code.google.com/searchframe#OAMlx_jo-ck/src/ash/shell/content_client/s...

used the real one. perhaps we want to move that line to somewhere in
ContentShell itself, so that it's used by that example and also browser_tests

+#endif
+
   shell_main_delegate_.reset(new ShellMainDelegate);
   shell_main_delegate_->PreSandboxStartup();
 
@@ -66,6 +76,10 @@ void ContentBrowserTest::TearDown() {
   BrowserTestBase::TearDown();
 
   shell_main_delegate_.reset();
+
+#if defined(OS_CHROMEOS)
+  chromeos::DBusThreadManager::Shutdown();
+#endif
 }
 
 #if defined(OS_POSIX)