Ensure that data doesn't leak between users on cros chrome crash.

chrome/browser/profile_manager.cc

 // Copyright (c) 2009 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 <set>
 
 #include "chrome/browser/profile_manager.h"
 
 #include "app/l10n_util.h"
 #include "base/command_line.h"
@@ skipping 13 matching lines @@
 #include "chrome/common/logging_chrome.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/notification_type.h"
 #include "chrome/common/pref_names.h"
 #include "grit/generated_resources.h"
 #include "net/http/http_transaction_factory.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_job.h"
 #include "net/url_request/url_request_job_tracker.h"
 
+#if defined(OS_CHROMEOS)
+#include "chrome/browser/chromeos/cros/cros_library.h"
+#include "chrome/browser/chromeos/cros/cryptohome_library.h"
+#endif
+
 // static
 void ProfileManager::ShutdownSessionServices() {
   ProfileManager* pm = g_browser_process->profile_manager();
   for (ProfileManager::const_iterator i = pm->begin(); i != pm->end(); ++i)
     (*i)->ShutdownSessionService();
 }
 
 // static
-Profile* ProfileManager::GetLoginWizardProfile() {
+Profile* ProfileManager::GetDefaultProfile() {
   FilePath user_data_dir;
   PathService::Get(chrome::DIR_USER_DATA, &user_data_dir);
   ProfileManager* profile_manager = g_browser_process->profile_manager();
-  return profile_manager->GetDefaultProfile(
-      user_data_dir)->GetOffTheRecordProfile();
+  return profile_manager->GetDefaultProfile(user_data_dir);
 }
 
 ProfileManager::ProfileManager() : logged_in_(false) {
   SystemMonitor::Get()->AddObserver(this);
 #if defined(OS_CHROMEOS)
   registrar_.Add(
       this,
       NotificationType::LOGIN_USER_CHANGED,
       NotificationService::AllSources());
 #endif
@@ skipping 26 matching lines @@
 
 FilePath ProfileManager::GetProfilePrefsPath(
     const FilePath &profile_dir) {
   FilePath default_prefs_path(profile_dir);
   default_prefs_path = default_prefs_path.Append(chrome::kPreferencesFilename);
   return default_prefs_path;
 }
 
 Profile* ProfileManager::GetDefaultProfile(const FilePath& user_data_dir) {
   FilePath default_profile_dir(user_data_dir);
-  std::wstring profile = chrome::kNotSignedInProfile;
 #if defined(OS_CHROMEOS)
-  // If the user has logged in, pick up the new profile.
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
-  // TODO(davemoore) Delete this once chromium os has started using
-  // "--login-profile" instead of "--profile".
-  if (logged_in_ && command_line.HasSwitch(switches::kProfile)) {
-    profile = command_line.GetSwitchValue(switches::kProfile);
+  if (logged_in_) {
+    std::wstring profile_dir;
+    // If the user has logged in, pick up the new profile.
+    // TODO(davemoore) Delete this once chromium os has started using
+    // "--login-profile" instead of "--profile".
+    if (command_line.HasSwitch(switches::kLoginProfile)) {
+      profile_dir = command_line.GetSwitchValue(switches::kLoginProfile);
+    } else if (command_line.HasSwitch(switches::kProfile)) {
+      profile_dir = command_line.GetSwitchValue(switches::kProfile);
+    } else {
+      // We should never be logged in with no profile dir.
+      NOTREACHED();
+      return NULL;
+    }
+    default_profile_dir = default_profile_dir.Append(
+        FilePath::FromWStringHack(profile_dir));
+    return GetProfile(default_profile_dir);
+  } else {
+    // If not logged in on cros, always return the incognito profile
+    default_profile_dir = default_profile_dir.Append(
+        FilePath::FromWStringHack(chrome::kNotSignedInProfile));
+    Profile*profile = GetProfile(default_profile_dir);
+
+    // For cros, return the OTR profile so we never accidentally keep
+    // user data in an unencrypted profile. But doing this makes
+    // many of the browser and ui tests fail.
+    // TODO(davemoore) Fix the tests.
+    if (!command_line.HasSwitch(switches::kTestType))
+      profile = profile->GetOffTheRecordProfile();
+
+    return profile;
   }
-  if (logged_in_ && command_line.HasSwitch(switches::kLoginProfile)) {
-    profile = command_line.GetSwitchValue(switches::kLoginProfile);
-  }
+#else
+  default_profile_dir = default_profile_dir.Append(
+      FilePath::FromWStringHack(chrome::kNotSignedInProfile));
+  return GetProfile(default_profile_dir);
 #endif
-  default_profile_dir = default_profile_dir.Append(
-      FilePath::FromWStringHack(profile));
-  return GetProfile(default_profile_dir);
 }
 
 Profile* ProfileManager::GetProfile(const FilePath& profile_dir) {
   // If the profile is already loaded (e.g., chrome.exe launched twice), just
   // return it.
   Profile* profile = GetProfileByPath(profile_dir);
   if (NULL != profile)
     return profile;
 
   if (!ProfileManager::IsProfile(profile_dir)) {
@@ skipping 73 matching lines @@
         NewRunnableFunction(&ProfileManager::ResumeProfile, *i));
   }
 }
 
 void ProfileManager::Observe(
     NotificationType type,
     const NotificationSource& source,
     const NotificationDetails& details) {
 #if defined(OS_CHROMEOS)
   if (type == NotificationType::LOGIN_USER_CHANGED) {
+    CHECK(chromeos::CrosLibrary::EnsureLoaded());
+    // If we don't have a mounted profile directory we're in trouble.
+    // TODO(davemoore) Once we have better api this check should ensure that
+    // our profile directory is the one that's mounted, and that it's mounted
+    // as the current user.
+    CHECK(chromeos::CryptohomeLibrary::Get()->IsMounted());
     logged_in_ = true;
   }
 #endif
 }
 
 void ProfileManager::SuspendProfile(Profile* profile) {
   DCHECK(profile);
   DCHECK(ChromeThread::CurrentlyOn(ChromeThread::IO));
 
   for (URLRequestJobTracker::JobIterator i = g_url_request_job_tracker.begin();
@@ skipping 31 matching lines @@
   if (!file_util::PathExists(path)) {
     // TODO(tc): http://b/1094718 Bad things happen if we can't write to the
     // profile directory.  We should eventually be able to run in this
     // situation.
     if (!file_util::CreateDirectory(path))
       return NULL;
   }
 
   return Profile::CreateProfile(path);
 }