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

chrome/browser/ui/extensions/extension_message_bubble_factory.cc

 // Copyright 2015 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.
 
 #include "chrome/browser/ui/extensions/extension_message_bubble_factory.h"
 
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/metrics/field_trial.h"
 #include "build/build_config.h"
+#include "chrome/browser/browser_process.h"

[Devlin, 2016/09/21 01:50:58]

Whoops - will clean up these includes

[Finnur, 2016/09/21 10:05:10]

OK. 

Remember the BUG= also.

[Devlin, 2016/09/21 17:07:31]

Done and done. :)

 #include "chrome/browser/extensions/dev_mode_bubble_delegate.h"
 #include "chrome/browser/extensions/extension_message_bubble_controller.h"
 #include "chrome/browser/extensions/install_verifier.h"
 #include "chrome/browser/extensions/proxy_overridden_bubble_delegate.h"
 #include "chrome/browser/extensions/settings_api_bubble_delegate.h"
 #include "chrome/browser/extensions/settings_api_helpers.h"
 #include "chrome/browser/extensions/suspicious_extension_bubble_delegate.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/startup/startup_browser_creator.h"
 #include "chrome/common/channel_info.h"
+#include "chrome/common/pref_names.h"
+#include "components/prefs/pref_service.h"
 #include "components/version_info/version_info.h"
 #include "extensions/common/feature_switch.h"
 
 namespace {
 
 // A map of all profiles evaluated, so we can tell if it's the initial check.
 // TODO(devlin): It would be nice to coalesce all the "profiles evaluated" maps
 // that are in the different bubble controllers.
 base::LazyInstance<std::set<Profile*> > g_profiles_evaluated =
     LAZY_INSTANCE_INITIALIZER;
@@ skipping 94 matching lines @@
     controller.reset(
         new extensions::ExtensionMessageBubbleController(
             new extensions::SuspiciousExtensionBubbleDelegate(
                 browser_->profile()),
             browser_));
     if (controller->ShouldShow())
       return controller;
   }
 
   if (EnableSettingsApiBubble()) {
-    // No use showing this if it's not the startup of the profile.
-    if (is_initial_check) {
+    // No use showing this if it's not the startup of the profile, and if the
+    // browser was restarted, then we always do a session restore (rather than
+    // showing normal startup pages).
+    if (is_initial_check && !StartupBrowserCreator::WasRestarted()) {
       controller.reset(new extensions::ExtensionMessageBubbleController(
               new extensions::SettingsApiBubbleDelegate(
                   browser_->profile(), extensions::BUBBLE_TYPE_STARTUP_PAGES),
                   browser_));
       if (controller->ShouldShow())
         return controller;
     }
   }
 
   if (EnableProxyOverrideBubble()) {
@@ skipping 18 matching lines @@
 
   controller.reset();
   return controller;
 }
 
 // static
 void ExtensionMessageBubbleFactory::set_override_for_tests(
     OverrideForTesting override) {
   g_override_for_testing = override;
 }