[Extensions] Fix a bug in the startup pages override bubble

chrome/browser/ui/extensions/extension_message_bubble_browsertest.cc

Index: chrome/browser/ui/extensions/extension_message_bubble_browsertest.cc
diff --git a/chrome/browser/ui/extensions/extension_message_bubble_browsertest.cc b/chrome/browser/ui/extensions/extension_message_bubble_browsertest.cc
index b52911675ab3efe315a2e4b1f196c623797189dc..10469b1fb3f6a875c04897febc31d4c039340faf 100644
--- a/chrome/browser/ui/extensions/extension_message_bubble_browsertest.cc
+++ b/chrome/browser/ui/extensions/extension_message_bubble_browsertest.cc
@@ -7,6 +7,7 @@
 #include "base/bind_helpers.h"
 #include "base/run_loop.h"
 #include "chrome/app/chrome_command_ids.h"
+#include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/extension_action_test_util.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/test_extension_dir.h"
@@ -15,6 +16,7 @@
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/extensions/extension_message_bubble_factory.h"
 #include "chrome/browser/ui/location_bar/location_bar.h"
+#include "chrome/browser/ui/startup/startup_browser_creator.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/toolbar/toolbar_actions_bar.h"
 #include "chrome/common/pref_names.h"
@@ -256,6 +258,31 @@ void ExtensionMessageBubbleBrowserTest::TestControlledSearchBubbleShown() {
   CloseBubble(browser());
 }
 
+void ExtensionMessageBubbleBrowserTest::PreTestControlledStartupBubbleShown() {
+  ASSERT_TRUE(InstallExtensionWithPermissionsGranted(
+      test_data_dir_.AppendASCII("startup_pages"), 1));
+}
+
+void ExtensionMessageBubbleBrowserTest::TestControlledStartupBubbleShown() {
+  base::RunLoop().RunUntilIdle();
+  CheckBubble(browser(), ANCHOR_BROWSER_ACTION, true);
+  CloseBubble(browser());
+}
+
+void ExtensionMessageBubbleBrowserTest::
+    PreTestControlledStartupNotShownOnRestart() {
+  ASSERT_TRUE(InstallExtensionWithPermissionsGranted(
+      test_data_dir_.AppendASCII("startup_pages"), 1));
+  PrefService* pref_service = g_browser_process->local_state();
+  pref_service->SetBoolean(prefs::kWasRestarted, true);
+}
+
+void ExtensionMessageBubbleBrowserTest::
+    TestControlledStartupNotShownOnRestart() {
+  EXPECT_TRUE(StartupBrowserCreator::WasRestarted());
+  CheckBubbleIsNotPresent(browser(), false, false);
+}
+
 void ExtensionMessageBubbleBrowserTest::TestBubbleWithMultipleWindows() {
   CheckBubbleIsNotPresent(browser(), false, false);
   LoadExtension(test_data_dir_.AppendASCII("good_unpacked"));