Revert 177182 - ViewTest.ChangeNativeViewHierarchyFindRoots failure

chrome/browser/ui/views/simple_message_box_views.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/ui/simple_message_box.h"
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop.h"
@@ skipping 149 matching lines @@
 
 }  // namespace
 
 MessageBoxResult ShowMessageBox(gfx::NativeWindow parent,
                                 const string16& title,
                                 const string16& message,
                                 MessageBoxType type) {
   scoped_refptr<SimpleMessageBoxViews> dialog(
       new SimpleMessageBoxViews(title, message, type));
 
-  if (parent)
-    views::Widget::CreateWindowWithParent(dialog, parent)->Show();
-  else
-    views::Widget::CreateWindow(dialog)->Show();
+  views::Widget::CreateWindowWithParent(dialog, parent)->Show();
 
 #if defined(USE_AURA)
   // Use the widget's window itself so that the message loop
   // exists when the dialog is closed by some other means than
   // |Cancel| or |Accept|.
   aura::Window* anchor = parent ?
       parent : dialog->GetWidget()->GetNativeWindow();
   aura::client::GetDispatcherClient(anchor->GetRootWindow())->
       RunWithDispatcher(dialog, anchor, true);
 #else
   {
     MessageLoop::ScopedNestableTaskAllower allow(MessageLoopForUI::current());
     base::RunLoop run_loop(dialog);
     run_loop.Run();
   }
 #endif
   return dialog->result();
 }
 
 }  // namespace chrome