Revert r48735 "Added user image screen for new user login (or old user logging in through"

chrome/browser/chromeos/login/cookie_fetcher.cc

 // Copyright (c) 2010 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/cookie_fetcher.h"
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/path_service.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 35 matching lines @@
       fetcher_.reset(issue_handler_->Handle(data, this));
       return;
     }
   }
   LOG(INFO) << "Calling DoLaunch";
   launcher_->DoLaunch(profile_);
   delete this;
 }
 
 void CookieFetcher::DelegateImpl::DoLaunch(Profile* profile) {
-  if (profile == ProfileManager::GetDefaultProfile()) {
+  FilePath user_data_dir;
+  PathService::Get(chrome::DIR_USER_DATA, &user_data_dir);
+  ProfileManager* profile_manager = g_browser_process->profile_manager();
+  if (profile == profile_manager->GetDefaultProfile(user_data_dir)) {
     LoginUtils::DoBrowserLaunch(profile);
   } else {
     LOG(ERROR) <<
         "Profile has changed since we started populating it with cookies";
   }
 }
 
 }  // namespace chromeos