Linux: show an infobar about Ubuntu Lucid deprecation

This will also be shown on Debian 6.0 Squeeze and RHEL 6.

BUG=171039

Review URL: https://codereview.chromium.org/11943021

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

4 files changed, 16 insertions, 7 deletions

diff --git a/chrome/browser/sessions/better_session_restore_browsertest.cc b/chrome/browser/sessions/better_session_restore_browsertest.cc
index afb36ef..b14ba61 100644
--- a/chrome/browser/sessions/better_session_restore_browsertest.cc
+++ b/chrome/browser/sessions/better_session_restore_browsertest.cc
@@ -561,6 +561,7 @@ class BetterSessionRestoreCrashTest : public BetterSessionRestoreTest {
     StartupBrowserCreator::ClearLaunchedProfilesForTesting();
 
     CommandLine dummy(CommandLine::NO_PROGRAM);
+    dummy.AppendSwitchASCII(switches::kTestType, "browser");
     int return_code;
     StartupBrowserCreator browser_creator;
     std::vector<Profile*> last_opened_profiles(1, profile);
diff --git a/chrome/browser/ui/startup/obsolete_os_info_bar.cc b/chrome/browser/ui/startup/obsolete_os_info_bar.cc
index 744e0b5..b705056 100644
--- a/chrome/browser/ui/startup/obsolete_os_info_bar.cc
+++ b/chrome/browser/ui/startup/obsolete_os_info_bar.cc
@@ -22,15 +22,17 @@ namespace chrome {
 // static
 void ObsoleteOSInfoBar::Create(InfoBarService* infobar_service) {
 #if defined(TOOLKIT_GTK)
-  // We've deprecated support for Ubuntu Hardy.  Rather than attempting to
+  // We've deprecated support for Ubuntu Lucid.  Rather than attempting to
   // determine whether you're using that, we instead key off the GTK version;
   // this will also deprecate other distributions (including variants of Ubuntu)
   // that are of a similar age.
   // Version key:
-  //   Ubuntu Hardy: GTK 2.12
-  //   RHEL 6:       GTK 2.18
-  //   Ubuntu Lucid: GTK 2.20
-  if (!gtk_check_version(2, 18, 0))
+  //   RHEL 6:             GTK 2.18
+  //   Debian 6 (Squeeze): GTK 2.20
+  //   Ubuntu Lucid:       GTK 2.20
+  //   openSUSE 12.2       GTK 2.24
+  //   Ubuntu Precise:     GTK 2.24
+  if (!gtk_check_version(2, 24, 0))
     return;
 #else
   // No other platforms currently show this infobar.
diff --git a/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc b/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc
index bf28c49..b0ad1f5 100644
--- a/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc
@@ -914,6 +914,7 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTest, ProfilesLaunchedAfterCrash) {
       Profile::EXIT_CRASHED;
 
   CommandLine dummy(CommandLine::NO_PROGRAM);
+  dummy.AppendSwitchASCII(switches::kTestType, "browser");
   int return_code;
   StartupBrowserCreator browser_creator;
   std::vector<Profile*> last_opened_profiles;
diff --git a/chrome/browser/ui/startup/startup_browser_creator_impl.cc b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
index 5db24d7..2b9d0fb 100644
--- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
@@ -866,8 +866,13 @@ void StartupBrowserCreatorImpl::AddInfoBarsIfNecessary(
   // focused tabs here.
   if (is_process_startup == chrome::startup::IS_PROCESS_STARTUP) {
     chrome::ShowBadFlagsPrompt(browser);
-    chrome::ObsoleteOSInfoBar::Create(
-        InfoBarService::FromWebContents(chrome::GetActiveWebContents(browser)));
+    // TODO(phajdan.jr): Always enable after migrating bots:
+    // http://crbug.com/170262 .
+    if (!command_line_.HasSwitch(switches::kTestType)) {
+      chrome::ObsoleteOSInfoBar::Create(
+          InfoBarService::FromWebContents(
+              chrome::GetActiveWebContents(browser)));
+    }
 
     if (browser_defaults::kOSSupportsOtherBrowsers &&
         !command_line_.HasSwitch(switches::kNoDefaultBrowserCheck)) {