summaryrefslogtreecommitdiffstats
path: root/chrome/browser/google/google_update_settings_unittest.cc
diff options
context:
space:
mode:
authormsw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-26 04:05:29 +0000
committermsw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-26 04:05:29 +0000
commit2381ed2ed0e7560a29fe484d6c79103ca8eafa12 (patch)
tree59870ca2e3de1b1bece166dae2981a983ae65b54 /chrome/browser/google/google_update_settings_unittest.cc
parent31d71b0e8b1b04c12e6ec654d9deca49f6303a6e (diff)
downloadchromium_src-2381ed2ed0e7560a29fe484d6c79103ca8eafa12.zip
chromium_src-2381ed2ed0e7560a29fe484d6c79103ca8eafa12.tar.gz
chromium_src-2381ed2ed0e7560a29fe484d6c79103ca8eafa12.tar.bz2
Remove the first-run search engine dialog/ballot.
No changes to the Gtk and Mac first-run (reporting & default browser) dialog. Tested optionally with GYP_DEFINES="branding=Chrome" and "--first-run --organic". Chromium (all platforms): Shows the browser window directly (no dialog). Chrome (Windows): Shows the browser window directly (no dialog). Chrome (Linux and Mac): Shows the first-run (reporting & default browser) dialog before the browser window. TODO(msw): Close crbug.com/111062 for removed test. TODO(msw): Remove search engine icon/image resources (TemplateURL::logo_id_). BUG=107005 TEST=No more standalone search engine selection dialog/ballot, Gtk and Mac first-run dialog works as before. Review URL: http://codereview.chromium.org/9285002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119189 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/google/google_update_settings_unittest.cc')
-rw-r--r--chrome/browser/google/google_update_settings_unittest.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/google/google_update_settings_unittest.cc b/chrome/browser/google/google_update_settings_unittest.cc
index 4301a35..0896a16 100644
--- a/chrome/browser/google/google_update_settings_unittest.cc
+++ b/chrome/browser/google/google_update_settings_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
@@ -35,7 +35,7 @@ TEST_F(GoogleUpdateTest, LastRunTime) {
#endif // defined(OS_WIN)
-TEST_F(GoogleUpdateTest, ShouldShowSearchEngineDialog) {
+TEST_F(GoogleUpdateTest, IsOrganicFirstRunBrandCodes) {
// Test some brand codes to ensure that future changes to this method won't
// go unnoticed.
EXPECT_FALSE(google_util::IsOrganicFirstRun("CHFO"));