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

chrome/browser/first_run/first_run_browsertest.cc

Index: chrome/browser/first_run/first_run_browsertest.cc
diff --git a/chrome/browser/first_run/first_run_browsertest.cc b/chrome/browser/first_run/first_run_browsertest.cc
index 47c2ef6c786f936d7cca0f8b77df6b6703d41fee..40383b2eeca09d20f909c16be0bac8807e7c6bc9 100644
--- a/chrome/browser/first_run/first_run_browsertest.cc
+++ b/chrome/browser/first_run/first_run_browsertest.cc
@@ -19,6 +19,13 @@ IN_PROC_BROWSER_TEST_F(FirstRunBrowserTest, SetShowFirstRunBubblePref) {
       prefs::kShouldShowFirstRunBubble));
   EXPECT_TRUE(g_browser_process->local_state()->GetBoolean(
       prefs::kShouldShowFirstRunBubble));
+  // Test that toggling the value works in either direction after it's been set.
+  EXPECT_TRUE(first_run::SetShowFirstRunBubblePref(false));
+  EXPECT_FALSE(g_browser_process->local_state()->GetBoolean(
+      prefs::kShouldShowFirstRunBubble));
+  EXPECT_TRUE(first_run::SetShowFirstRunBubblePref(true));
+  EXPECT_TRUE(g_browser_process->local_state()->GetBoolean(
+      prefs::kShouldShowFirstRunBubble));
 }
 
 IN_PROC_BROWSER_TEST_F(FirstRunBrowserTest, SetShowWelcomePagePref) {
@@ -30,23 +37,3 @@ IN_PROC_BROWSER_TEST_F(FirstRunBrowserTest, SetShowWelcomePagePref) {
   EXPECT_TRUE(g_browser_process->local_state()->GetBoolean(
       prefs::kShouldShowWelcomePage));
 }
-
-IN_PROC_BROWSER_TEST_F(FirstRunBrowserTest, SetOEMFirstRunBubblePref) {
-  EXPECT_FALSE(g_browser_process->local_state()->FindPreference(
-      prefs::kShouldUseOEMFirstRunBubble));
-  EXPECT_TRUE(FirstRun::SetOEMFirstRunBubblePref());
-  ASSERT_TRUE(g_browser_process->local_state()->FindPreference(
-      prefs::kShouldUseOEMFirstRunBubble));
-  EXPECT_TRUE(g_browser_process->local_state()->GetBoolean(
-      prefs::kShouldUseOEMFirstRunBubble));
-}
-
-IN_PROC_BROWSER_TEST_F(FirstRunBrowserTest, SetMinimalFirstRunBubblePref) {
-  EXPECT_FALSE(g_browser_process->local_state()->FindPreference(
-      prefs::kShouldUseMinimalFirstRunBubble));
-  EXPECT_TRUE(first_run::SetMinimalFirstRunBubblePref());
-  ASSERT_TRUE(g_browser_process->local_state()->FindPreference(
-      prefs::kShouldUseMinimalFirstRunBubble));
-  EXPECT_TRUE(g_browser_process->local_state()->GetBoolean(
-      prefs::kShouldUseMinimalFirstRunBubble));
-}