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

chrome/browser/chromeos/login/wizard_controller.h

Index: chrome/browser/chromeos/login/wizard_controller.h
===================================================================
--- chrome/browser/chromeos/login/wizard_controller.h	(revision 83304)
+++ chrome/browser/chromeos/login/wizard_controller.h	(working copy)
@@ -30,7 +30,6 @@
 class LoginDisplayHost;
 class NetworkScreen;
 class RegistrationScreen;
-class StartupCustomizationDocument;
 class UpdateScreen;
 class UserImageScreen;
 class WizardInProcessBrowserTest;
@@ -131,14 +130,6 @@
   // Set URL to open on browser launch.
   void set_start_url(const GURL& start_url) { start_url_ = start_url; }
 
-  // Sets partner startup customization. WizardController takes ownership
-  // of the document object.
-  void SetCustomization(
-      const chromeos::StartupCustomizationDocument* customization);
-
-  // Returns partner startup customization document owned by WizardController.
-  const chromeos::StartupCustomizationDocument* GetCustomization() const;
-
   // If being at register screen proceeds to the next one.
   void SkipRegistration();
 
@@ -274,9 +265,6 @@
   // Default WizardController.
   static WizardController* default_controller_;
 
-  // Partner startup customizations.
-  scoped_ptr<const chromeos::StartupCustomizationDocument> customization_;
-
   // URL to open on browser launch.
   GURL start_url_;