Implement the new first run bubble, clean up old bubbles.

chrome/installer/util/master_preferences_unittest.cc

-// 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.
 //
 // Unit tests for master preferences related methods.
 
 #include "base/file_util.h"
 #include "base/json/json_value_serializer.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/stringprintf.h"
@@ skipping 41 matching lines @@
     "     \"import_bookmarks_from_file\": \"c:\\\\foo\",\n"
     "     \"import_home_page\": true,\n"
     "     \"create_all_shortcuts\": true,\n"
     "     \"do_not_launch_chrome\": true,\n"
     "     \"make_chrome_default\": true,\n"
     "     \"make_chrome_default_for_user\": true,\n"
     "     \"system_level\": true,\n"
     "     \"verbose_logging\": true,\n"
     "     \"require_eula\": true,\n"
     "     \"alternate_shortcut_text\": true,\n"
-    "     \"oem_bubble\": true,\n"
     "     \"chrome_shortcut_icon_index\": 1,\n"
     "     \"ping_delay\": 40,\n"
     "     \"search_engine_experiment\": true\n"
     "  },\n"
     "  \"blah\": {\n"
     "     \"import_history\": false\n"
     "  }\n"
     "} \n";
 
   EXPECT_TRUE(file_util::WriteFile(prefs_file(), text, sizeof(text)));
   installer::MasterPreferences prefs(prefs_file());
 
   const char* expected_true[] = {
     installer::master_preferences::kDistroSkipFirstRunPref,
     installer::master_preferences::kDistroShowWelcomePage,
     installer::master_preferences::kDistroImportSearchPref,
     installer::master_preferences::kDistroImportHistoryPref,
     installer::master_preferences::kDistroImportBookmarksPref,
     installer::master_preferences::kDistroImportHomePagePref,
     installer::master_preferences::kCreateAllShortcuts,
     installer::master_preferences::kDoNotLaunchChrome,
     installer::master_preferences::kMakeChromeDefault,
     installer::master_preferences::kMakeChromeDefaultForUser,
     installer::master_preferences::kSystemLevel,
     installer::master_preferences::kVerboseLogging,
     installer::master_preferences::kRequireEula,
     installer::master_preferences::kAltShortcutText,
-    installer::master_preferences::kAltFirstRunBubble,
     installer::master_preferences::kSearchEngineExperimentPref,
   };
 
   for (int i = 0; i < arraysize(expected_true); ++i) {
     bool value = false;
     EXPECT_TRUE(prefs.GetBool(expected_true[i], &value));
     EXPECT_TRUE(value) << expected_true[i];
   }
 
   std::string str_value;
@@ skipping 245 matching lines @@
 
   EXPECT_TRUE(pref_cf.is_multi_install());
   EXPECT_FALSE(pref_cf.install_chrome());
   EXPECT_TRUE(pref_cf.install_chrome_frame());
 
   EXPECT_TRUE(pref_chrome_cf.is_multi_install());
   EXPECT_TRUE(pref_chrome_cf.install_chrome());
   EXPECT_TRUE(pref_chrome_cf.install_chrome_frame());
 }