OAuth2LoginManager+MergeSessionThrottle hardening, multi-profle support

chrome/browser/ui/startup/startup_browser_creator.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/ui/startup/startup_browser_creator.h"
 
 #include <algorithm>   // For max().
 #include <set>
 
 #include "apps/app_load_service.h"
@@ skipping 280 matching lines @@
         *return_code = chrome::RESULT_CODE_INVALID_CMDLINE_URL;
       return false;
     }
   } else {
     in_synchronous_profile_launch_ = false;
   }
 
   profile_launch_observer.Get().AddLaunched(profile);
 
 #if defined(OS_CHROMEOS)
-  chromeos::ProfileHelper::ProfileStartup(profile, process_startup);
+  g_browser_process->platform_part()->profile_helper()->ProfileStartup(
+      profile,
+      process_startup);
 #endif
   return true;
 }
 
 // static
 bool StartupBrowserCreator::WasRestarted() {
   // Stores the value of the preference kWasRestarted had when it was read.
   static bool was_restarted = false;
 
   if (!was_restarted_read_) {
@@ skipping 431 matching lines @@
 
 // static
 bool StartupBrowserCreator::ActivatedProfile() {
   return profile_launch_observer.Get().activated_profile();
 }
 
 bool HasPendingUncleanExit(Profile* profile) {
   return profile->GetLastSessionExitType() == Profile::EXIT_CRASHED &&
       !profile_launch_observer.Get().HasBeenLaunched(profile);
 }