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

chrome/browser/chromeos/login/login_display_host.h

 // Copyright (c) 2011 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_LOGIN_DISPLAY_HOST_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_LOGIN_DISPLAY_HOST_H_
 #pragma once
 
 #include <string>
 
@@ skipping 41 matching lines @@
   virtual void SetStatusAreaVisible(bool visible) = 0;
 
   // Creates and shows a background window.
   virtual void ShowBackground() = 0;
 
   // Starts out-of-box-experience flow or shows other screen handled by
   // Wizard controller i.e. camera, recovery.
   // One could specify start screen with |first_screen_name|.
   virtual void StartWizard(
       const std::string& first_screen_name,
-      const chromeos::StartupCustomizationDocument* manifest,
       const GURL& start_url) = 0;
 
   // Starts sign in screen.
   virtual void StartSignInScreen() = 0;
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_LOGIN_DISPLAY_HOST_H_