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

chrome/browser/chromeos/login/helper.h

Index: chrome/browser/chromeos/login/helper.h
===================================================================
--- chrome/browser/chromeos/login/helper.h	(revision 83304)
+++ chrome/browser/chromeos/login/helper.h	(working copy)
@@ -33,7 +33,6 @@
 
 namespace chromeos {
 
-class StartupCustomizationDocument;
 class NetworkLibrary;
 
 // View that provides interface for start/stop throbber above the view.
@@ -109,10 +108,6 @@
 // Ethernet > WiFi > Cellular. Same for connecting network.
 string16 GetCurrentNetworkName(NetworkLibrary* network_library);
 
-// Load OEM partner startup customization manifest
-// containing locale, timezone, EULA, etc.
-const chromeos::StartupCustomizationDocument* LoadStartupManifest();
-
 // Define the constants in |login| namespace to avoid potential
 // conflict with other chromeos components.
 namespace login {