Merge 176800

chrome/browser/chromeos/login/test_login_utils.cc

 // Copyright (c) 2012 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 "chrome/browser/chromeos/login/test_login_utils.h"
 
 #include "chrome/browser/chromeos/login/mock_authenticator.h"
 
 namespace chromeos {
 
 TestLoginUtils::TestLoginUtils(const std::string& expected_username,
                                const std::string& expected_password)
     : expected_username_(expected_username),
       expected_password_(expected_password) {
 }
 
 TestLoginUtils::~TestLoginUtils() {}
 
 void TestLoginUtils::PrepareProfile(
     const std::string& username,
     const std::string& display_email,
     const std::string& password,
-    bool pending_requests,
     bool using_oauth,
     bool has_cookies,
     Delegate* delegate) {
   DCHECK_EQ(expected_username_, username);
   DCHECK_EQ(expected_password_, password);
   // Profile hasn't been loaded.
   delegate->OnProfilePrepared(NULL);
 }
 
 void TestLoginUtils::DelegateDeleted(Delegate* delegate) {
@@ skipping 12 matching lines @@
   return std::string();
 }
 
 void TestLoginUtils::InitRlzDelayed(Profile* user_profile) {
 }
 
 void TestLoginUtils::StopBackgroundFetchers() {
 }
 
 }  // namespace chromeos