cros: Allow default app order to be loaded from an external file.

chrome/browser/chromeos/chrome_browser_main_chromeos.cc

Index: chrome/browser/chromeos/chrome_browser_main_chromeos.cc
diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
index 5446a3e87f62c454df2808cb6cf2024052010e50..2f1b74172823970a469984e5e0cd5d91e4304284 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -25,6 +25,7 @@
 #include "chrome/browser/chromeos/display/display_preferences.h"
 #include "chrome/browser/chromeos/display/primary_display_switch_observer.h"
 #include "chrome/browser/chromeos/external_metrics.h"
+#include "chrome/browser/chromeos/extensions/default_app_order.h"
 #include "chrome/browser/chromeos/imageburner/burn_manager.h"
 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
 #include "chrome/browser/chromeos/input_method/xkeyboard.h"
@@ -399,9 +400,19 @@ void ChromeBrowserMainPartsChromeos::PreProfileInit() {
       g_browser_process->browser_policy_connector()->InitializeUserPolicy(
           username, false  /* wait_for_policy_fetch */);
     }
+
+    // Load the default app order synchronously for restarting case.
+    app_order_loader_.reset(
+        new chromeos::default_app_order::ExternalLoader(false /* async */));
+
     chromeos::UserManager::Get()->SessionStarted();
   }
 
+  if (!app_order_loader_) {
+    app_order_loader_.reset(
+        new chromeos::default_app_order::ExternalLoader(true /* async */));
+  }
+
   // In Aura builds this will initialize ash::Shell.
   ChromeBrowserMainPartsLinux::PreProfileInit();
 }