Lazy AppLauncher creation to make tests stable.

 There seems to be a timing issue in renderer deletion and io thread
 deletion, and the resource that has to be deleted before io thread are not
 deleted by the time io thread is deleted. Since this will soon be changed,
 i just chagned this to be created on demand for now.

 This also reverts commit dd6c4ab11002a308bf8eede36bb632e95d3a1382.

TBR=sky@chromium.org
BUG=32641
TEST=none

Review URL: http://codereview.chromium.org/669196

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

3 files changed, 5 insertions, 11 deletions

diff --git a/chrome/app/chrome_main_uitest.cc b/chrome/app/chrome_main_uitest.cc
index 7bd027b..ab79407f 100644
--- a/chrome/app/chrome_main_uitest.cc
+++ b/chrome/app/chrome_main_uitest.cc
@@ -18,11 +18,7 @@ TEST_F(ChromeMainTest, AppLaunch) {
   if (UITest::in_process_renderer()) {
     EXPECT_EQ(1, UITest::GetBrowserProcessCount());
   } else {
-#if defined(OS_CHROMEOS)
-    // On Chromeos we'll have five processes: browser, renderer, app launcher,
-    // zygote and sandbox helper.
-    EXPECT_EQ(5, UITest::GetBrowserProcessCount());
-#elif defined(OS_LINUX)
+#if defined(OS_LINUX)
     // On Linux we'll have four processes: browser, renderer, zygote and
     // sandbox helper.
     EXPECT_EQ(4, UITest::GetBrowserProcessCount());
diff --git a/chrome/browser/chromeos/frame/browser_view.cc b/chrome/browser/chromeos/frame/browser_view.cc
index 032cf2d..ca90857 100644
--- a/chrome/browser/chromeos/frame/browser_view.cc
+++ b/chrome/browser/chromeos/frame/browser_view.cc
@@ -388,7 +388,6 @@ void BrowserView::Init() {
   AddChildView(spacer_);
 
   InitSystemMenu();
-  main_menu_.reset(new AppLauncher());
 
   // The ContextMenuController has to be set to a NonClientView but
   // not to a NonClientFrameView because a TabStrip is not a child of
@@ -459,6 +458,9 @@ void BrowserView::ShowBookmarkBubble(const GURL& url, bool already_bookmarked) {
 // views::ButtonListener overrides.
 void BrowserView::ButtonPressed(views::Button* sender,
                                 const views::Event& event) {
+  if (!main_menu_.get()) {
+    main_menu_.reset(new AppLauncher());
+  }
   main_menu_->Show(browser());
 }
 
diff --git a/chrome/worker/worker_uitest.cc b/chrome/worker/worker_uitest.cc
index 7e4eb2e..1eedc25 100644
--- a/chrome/worker/worker_uitest.cc
+++ b/chrome/worker/worker_uitest.cc
@@ -59,11 +59,7 @@ class WorkerTest : public UILayoutTest {
     // The 1 is for the browser process.
     int number_of_processes = 1 + workers +
         (UITest::in_process_renderer() ? 0 : tabs);
-#if defined(OS_CHROMEOS)
-    // On Chromeos, we also have a zygote process, a sandbox host process
-    // and app launcher's renderer.
-    number_of_processes += 3;
-#elif defined(OS_LINUX)
+#if defined(OS_LINUX)
     // On Linux, we also have a zygote process and a sandbox host process.
     number_of_processes += 2;
 #endif