From 2e65118f139c3c83419776b372a60c90e1405ba6 Mon Sep 17 00:00:00 2001
From: "mirandac@google.com"
 <mirandac@google.com@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Fri, 16 Jul 2010 18:53:31 +0000
Subject: Fix chrome mini installer test.

BUG=none
TEST=none
Review URL: http://codereview.chromium.org/3014010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52714 0039d316-1c4b-4281-b951-d872f2087c98
---
 .../mini_installer_test/chrome_mini_installer.cc   | 26 ++++++++--------------
 .../mini_installer_test/chrome_mini_installer.h    |  3 ---
 2 files changed, 9 insertions(+), 20 deletions(-)

(limited to 'chrome/test/mini_installer_test')

diff --git a/chrome/test/mini_installer_test/chrome_mini_installer.cc b/chrome/test/mini_installer_test/chrome_mini_installer.cc
index 23fc0d6..5d54706 100644
--- a/chrome/test/mini_installer_test/chrome_mini_installer.cc
+++ b/chrome/test/mini_installer_test/chrome_mini_installer.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
 
@@ -351,18 +351,6 @@ bool ChromeMiniInstaller::CloseChromeBrowser() {
   return true;
 }
 
-// Closes the First Run UI dialog.
-void ChromeMiniInstaller::CloseFirstRunUIDialog(bool over_install) {
-  MiniInstallerTestUtil::VerifyProcessLaunch(installer_util::kChromeExe, true);
-  if (!over_install) {
-    ASSERT_TRUE(MiniInstallerTestUtil::CloseWindow(
-        mini_installer_constants::kChromeFirstRunUI, WM_CLOSE));
-  } else {
-    ASSERT_TRUE(MiniInstallerTestUtil::CloseWindow(
-        mini_installer_constants::kBrowserTabName, WM_CLOSE));
-  }
-}
-
 // Checks for Chrome registry keys.
 bool ChromeMiniInstaller::CheckRegistryKey(const std::wstring& key_path) {
   RegKey key;
@@ -572,8 +560,10 @@ bool ChromeMiniInstaller::GetChromeLaunchPath(std::wstring* launch_path) {
 void ChromeMiniInstaller::LaunchAndCloseChrome(bool over_install) {
   VerifyChromeLaunch(true);
   if ((install_type_ == mini_installer_constants::kSystemInstall) &&
-      (!over_install))
-    CloseFirstRunUIDialog(over_install);
+      (!over_install)) {
+    MiniInstallerTestUtil::VerifyProcessLaunch(
+        installer_util::kChromeExe, true);
+  }
   MiniInstallerTestUtil::CloseProcesses(installer_util::kChromeExe);
 }
 
@@ -590,8 +580,10 @@ void ChromeMiniInstaller::VerifyInstall(bool over_install) {
     VerifyChromeFrameInstall();
   } else {
     if ((install_type_ == mini_installer_constants::kUserInstall) &&
-        (!over_install))
-      CloseFirstRunUIDialog(over_install);
+        (!over_install)) {
+      MiniInstallerTestUtil::VerifyProcessLaunch(
+          installer_util::kChromeExe, true);
+    }
     PlatformThread::Sleep(800);
     FindChromeShortcut();
     LaunchAndCloseChrome(over_install);
diff --git a/chrome/test/mini_installer_test/chrome_mini_installer.h b/chrome/test/mini_installer_test/chrome_mini_installer.h
index 95adcba..4ee0080 100644
--- a/chrome/test/mini_installer_test/chrome_mini_installer.h
+++ b/chrome/test/mini_installer_test/chrome_mini_installer.h
@@ -87,9 +87,6 @@ class ChromeMiniInstaller {
   // Will clean up the machine if Chrome install is messed up.
   void CleanChromeInstall();
 
-  // Closes First Run UI dialog.
-  void CloseFirstRunUIDialog(bool over_install);
-
   // Closes Chrome uninstall confirm dialog window.
   bool CloseUninstallWindow();
 
-- 
cgit v1.1