Merge 176800

chrome/browser/chromeos/chrome_browser_main_chromeos.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/chrome_browser_main_chromeos.h"
 
 #include <string>
 #include <vector>
 
 #include "ash/shell.h"
@@ skipping 140 matching lines @@
   void OnLoginSuccess(const std::string& username,
                       const std::string& password,
                       bool pending_requests,
                       bool using_oauth) {
     pending_requests_ = pending_requests;
     if (!profile_prepared_) {
       // Will call OnProfilePrepared in the end.
       LoginUtils::Get()->PrepareProfile(username,
                                         std::string(),
                                         password,
-                                        pending_requests,
                                         using_oauth,
                                         false,
                                         this);
     } else if (!pending_requests) {
       delete this;
     }
   }
 
   // LoginUtils::Delegate implementation:
   virtual void OnProfilePrepared(Profile* profile) {
@@ skipping 575 matching lines @@
     } else if (trial->group() == margin_200mb) {
       LOG(WARNING) << "low_mem: Part of '200MB' experiment";
       LowMemoryObserver::SetLowMemoryMargin(200);
     } else {
       LOG(WARNING) << "low_mem: Part of 'default' experiment";
     }
   }
 }
 
 }  //  namespace chromeos