Merge 82987, 83304 - make sure that OEM tab is shown even if first login is Guest

chrome/browser/chromeos/login/existing_user_controller.cc

Index: chrome/browser/chromeos/login/existing_user_controller.cc
===================================================================
--- chrome/browser/chromeos/login/existing_user_controller.cc	(revision 83304)
+++ chrome/browser/chromeos/login/existing_user_controller.cc	(working copy)
@@ -14,6 +14,7 @@
 #include "chrome/browser/chromeos/cros/cryptohome_library.h"
 #include "chrome/browser/chromeos/cros/login_library.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
+#include "chrome/browser/chromeos/customization_document.h"
 #include "chrome/browser/chromeos/login/helper.h"
 #include "chrome/browser/chromeos/login/login_display_host.h"
 #include "chrome/browser/chromeos/login/views_login_display.h"
@@ -228,7 +229,7 @@
     OwnershipService::Status status) {
   if (status == OwnershipService::OWNERSHIP_NONE) {
     host_->StartWizard(WizardController::kEnterpriseEnrollmentScreenName,
-                       NULL, GURL());
+                       GURL());
     login_display_->OnFadeOut();
   }
   ownership_checker_.reset();
@@ -336,10 +337,15 @@
     CommandLine::ForCurrentProcess()->AppendArg(kGetStartedURL);
 #endif  // OFFICIAL_BUILD
 
-    if (!initial_start_page_.empty()) {
-      // If initial_start_page is not empty, add it as second tab.
-      // The tabs are opened in the same order as arguments in command line.
-      CommandLine::ForCurrentProcess()->AppendArg(initial_start_page_);
+    ServicesCustomizationDocument* customization =
+      ServicesCustomizationDocument::GetInstance();
+    if (customization->IsReady()) {
+      std::string locale = g_browser_process->GetApplicationLocale();
+      std::string initial_start_page =
+          customization->GetInitialStartPage(locale);
+      if (!initial_start_page.empty())
+        CommandLine::ForCurrentProcess()->AppendArg(initial_start_page);
+      customization->ApplyCustomization();
     }
 
     if (two_factor_credentials_) {
@@ -433,7 +439,7 @@
   GURL start_url;
   if (chromeos::UserManager::Get()->IsLoggedInAsGuest())
     start_url = guest_mode_url_;
-  host_->StartWizard(screen_name, NULL, start_url);
+  host_->StartWizard(screen_name, start_url);
   login_display_->OnFadeOut();
 }