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

chrome/browser/chromeos/login/existing_user_controller_browsertest.cc

 // 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.
 
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "chrome/browser/chromeos/cros/cros_mock.h"
 #include "chrome/browser/chromeos/cros/cros_in_process_browser_test.h"
 #include "chrome/browser/chromeos/cros/mock_cryptohome_library.h"
 #include "chrome/browser/chromeos/cros/mock_login_library.h"
@@ skipping 47 matching lines @@
   MOCK_CONST_METHOD1(CreateLoginDisplay,
                      LoginDisplay*(LoginDisplay::Delegate*));
   MOCK_CONST_METHOD0(GetNativeWindow, gfx::NativeWindow(void));
   MOCK_METHOD0(OnSessionStart, void(void));
   MOCK_METHOD1(SetOobeProgress, void(BackgroundView::LoginStep));
   MOCK_METHOD1(SetOobeProgressBarVisible, void(bool));
   MOCK_METHOD1(SetShutdownButtonEnabled, void(bool));
   MOCK_METHOD1(SetStatusAreaEnabled, void(bool));
   MOCK_METHOD1(SetStatusAreaVisible, void(bool));
   MOCK_METHOD0(ShowBackground, void(void));
-  MOCK_METHOD3(StartWizard, void(const std::string&,
-                                 const chromeos::StartupCustomizationDocument*,
+  MOCK_METHOD2(StartWizard, void(const std::string&,
                                  const GURL&));
   MOCK_METHOD0(StartSignInScreen, void(void));
 
  private:
  DISALLOW_COPY_AND_ASSIGN(MockLoginDisplayHost);
 };
 
 class MockLoginPerformerDelegate : public LoginPerformer::Delegate {
  public:
   explicit MockLoginPerformerDelegate(ExistingUserController* controller)
@@ skipping 95 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(ExistingUserControllerTest);
 };
 
 IN_PROC_BROWSER_TEST_F(ExistingUserControllerTest, NewUserLogin) {
   EXPECT_CALL(*mock_login_display_host_, SetStatusAreaEnabled(false))
       .Times(1);
   EXPECT_CALL(*mock_login_display_, SetUIEnabled(false))
       .Times(1);
   EXPECT_CALL(*mock_login_display_host_,
               StartWizard(WizardController::kUserImageScreenName,
-                          NULL,
                           GURL()))
       .Times(1);
   EXPECT_CALL(*mock_login_display_, OnFadeOut())
       .Times(1);
   existing_user_controller()->Login(kUsername, kPassword);
 }
 
 }  // namespace chromeos