summaryrefslogtreecommitdiffstats
path: root/chrome/installer/util/master_preferences_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/installer/util/master_preferences_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/installer/util/master_preferences_unittest.cc')
-rw-r--r--chrome/installer/util/master_preferences_unittest.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/chrome/installer/util/master_preferences_unittest.cc b/chrome/installer/util/master_preferences_unittest.cc
index c322476..a6738a6 100644
--- a/chrome/installer/util/master_preferences_unittest.cc
+++ b/chrome/installer/util/master_preferences_unittest.cc
@@ -61,8 +61,7 @@ TEST_F(MasterPreferencesTest, ParseDistroParams) {
" \"require_eula\": true,\n"
" \"alternate_shortcut_text\": true,\n"
" \"chrome_shortcut_icon_index\": 1,\n"
- " \"ping_delay\": 40,\n"
- " \"search_engine_experiment\": true\n"
+ " \"ping_delay\": 40\n"
" },\n"
" \"blah\": {\n"
" \"import_history\": false\n"
@@ -87,7 +86,6 @@ TEST_F(MasterPreferencesTest, ParseDistroParams) {
installer::master_preferences::kVerboseLogging,
installer::master_preferences::kRequireEula,
installer::master_preferences::kAltShortcutText,
- installer::master_preferences::kSearchEngineExperimentPref,
};
for (int i = 0; i < arraysize(expected_true); ++i) {