Root window wasn't shown in browser_test.

BUG=115967
TEST=none

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=134740

Review URL: https://chromiumcodereview.appspot.com/10273023

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@134821 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/chrome_browser_main.cc

@@ -182,14 +182,6 @@
 #include "chrome/browser/chrome_browser_main_x11.h"
 #endif
 
-#if defined(USE_AURA)
-#include "ui/aura/root_window.h"
-#endif
-
-#if defined(USE_ASH)
-#include "ash/shell.h"
-#endif
-
 using content::BrowserThread;
 
 namespace {
@@ -1897,7 +1889,6 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
 bool ChromeBrowserMainParts::MainMessageLoopRun(int* result_code) {
   // Set the result code set in PreMainMessageLoopRun or set above.
   *result_code = result_code_;
-
   if (!run_message_loop_)
     return true;  // Don't run the default message loop.
 
@@ -1905,11 +1896,7 @@ bool ChromeBrowserMainParts::MainMessageLoopRun(int* result_code) {
   // UI thread message loop as possible to get a stable measurement
   // across versions.
   RecordBrowserStartupTime();
-
 #if defined(USE_AURA)
-#if defined(USE_ASH)
-  ash::Shell::GetRootWindow()->ShowRootWindow();
-#endif
   MessageLoopForUI::current()->Run();
 #elif defined(TOOLKIT_VIEWS)
   views::AcceleratorHandler accelerator_handler;

chrome/browser/chrome_browser_main_extra_parts_ash.cc

@@ -83,6 +83,7 @@ void ChromeBrowserMainExtraPartsAsh::PreProfileInit() {
   gesture_handler_.reset(new UserGestureHandler);
   aura::client::SetUserGestureClient(
       ash::Shell::GetRootWindow(), gesture_handler_.get());
+  ash::Shell::GetRootWindow()->ShowRootWindow();
 }
 
 void ChromeBrowserMainExtraPartsAsh::PostProfileInit() {