Revert 102263 - Revert 102216 - Fix activation problem when showing bubble view

chrome/test/base/in_process_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 "chrome/test/base/in_process_browser_test.h"
 
 #include "base/command_line.h"
 #include "base/debug/stack_trace.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
@@ skipping 228 matching lines @@
   return incognito;
 }
 
 Browser* InProcessBrowserTest::CreateBrowserForPopup(Profile* profile) {
   Browser* browser = Browser::CreateForType(Browser::TYPE_POPUP, profile);
   AddBlankTabAndShow(browser);
   return browser;
 }
 
 void InProcessBrowserTest::AddBlankTabAndShow(Browser* browser) {
+  browser->window()->Show();
+
   ui_test_utils::WindowedNotificationObserver observer(
       content::NOTIFICATION_LOAD_STOP,
       NotificationService::AllSources());
   browser->AddSelectedTabWithURL(
       GURL(chrome::kAboutBlankURL), PageTransition::START_PAGE);
   observer.Wait();
 
-  browser->window()->Show();
+  browser->window()->Activate();
 }
 
 #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 42 matching lines @@
     return;
 
   // Invoke CloseAllBrowsersAndMayExit on a running message loop.
   // CloseAllBrowsersAndMayExit exits the message loop after everything has been
   // shut down properly.
   MessageLoopForUI::current()->PostTask(
       FROM_HERE,
       NewRunnableFunction(&BrowserList::AttemptExit));
   ui_test_utils::RunMessageLoop();
 }