Make content_shell and content_browsertests working with aura

content/test/content_browser_test.cc

 // Copyright (c) 2011 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 "content/test/content_browser_test.h"
 
 #include "base/command_line.h"
 #include "base/debug/stack_trace.h"
 #include "base/file_path.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/common/content_switches.h"
 #include "content/shell/shell.h"
 #include "content/shell/shell_main_delegate.h"
 #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
 
 namespace content {
 
 ContentBrowserTest::ContentBrowserTest() {
 #if defined(OS_MACOSX)
   // See comment in InProcessBrowserTest::InProcessBrowserTest().
   FilePath content_shell_path;
   CHECK(PathService::Get(base::FILE_EXE, &content_shell_path));
   content_shell_path = content_shell_path.DirName();
   content_shell_path = content_shell_path.Append(
       FILE_PATH_LITERAL("Content Shell.app/Contents/MacOS/Content Shell"));
   CHECK(PathService::Override(base::FILE_EXE, content_shell_path));
 #endif
 }
 
 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();
 
   CommandLine* command_line = CommandLine::ForCurrentProcess();
   command_line->AppendSwitch(switches::kContentBrowserTest);
 
   SetUpCommandLine(command_line);
 
 #if defined(OS_MACOSX)
   // See InProcessBrowserTest::PrepareTestCommandLine().
   FilePath subprocess_path;
   PathService::Get(base::FILE_EXE, &subprocess_path);
   subprocess_path = subprocess_path.DirName().DirName();
   DCHECK_EQ(subprocess_path.BaseName().value(), "Contents");
   subprocess_path = subprocess_path.Append(
       "Frameworks/Content Shell Helper.app/Contents/MacOS/Content Shell Helper");
   command_line->AppendSwitchPath(switches::kBrowserSubprocessPath,
                                  subprocess_path);
 #endif
 
   BrowserTestBase::SetUp();
 }
 
 void ContentBrowserTest::TearDown() {
   BrowserTestBase::TearDown();
 
   shell_main_delegate_.reset();
+
+#if defined(OS_CHROMEOS)
+  chromeos::DBusThreadManager::Shutdown();
+#endif
 }
 
 #if defined(OS_POSIX)
 // On SIGTERM (sent by the runner on timeouts), dump a stack trace (to make
 // debugging easier) and also exit with a known error code (so that the test
 // framework considers this a failure -- http://crbug.com/57578).
 static void DumpStackTraceSignalHandler(int signal) {
   base::debug::StackTrace().PrintBacktrace();
   _exit(128 + signal);
 }
@@ skipping 32 matching lines @@
   pool.Recycle();
 #endif
 
   for (RenderProcessHost::iterator i(RenderProcessHost::AllHostsIterator());
        !i.IsAtEnd(); i.Advance()) {
     i.GetCurrentValue()->FastShutdownIfPossible();
   }
 }
 
 }  // namespace content