Move ProfileLoader to chrome/browser/profiles.

apps/app_shim/app_shim_host_mac.cc

 // Copyright 2013 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 "apps/app_shim/app_shim_host_mac.h"
 
 #include "apps/app_shim/app_shim_handler_mac.h"
 #include "apps/app_shim/app_shim_messages.h"
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "content/public/browser/browser_thread.h"
 #include "ipc/ipc_channel_proxy.h"
 
 AppShimHost::AppShimHost()
-    : channel_(NULL), profile_(NULL) {
+    : channel_(NULL),
+      profile_(NULL),
+      profile_loader_(g_browser_process->profile_manager()),
+      weak_factory_(this) {
 }
 
 AppShimHost::~AppShimHost() {
   DCHECK(CalledOnValidThread());
   apps::AppShimHandler* handler = apps::AppShimHandler::GetForAppMode(app_id_);
   if (handler)
     handler->OnShimClose(this);
 }
 
 void AppShimHost::ServeChannel(const IPC::ChannelHandle& handle) {
@@ skipping 38 matching lines @@
                               std::string app_id,
                               apps::AppShimLaunchType launch_type) {
   DCHECK(CalledOnValidThread());
   DCHECK(!profile_);
   if (profile_) {
     // Only one app launch message per channel.
     Send(new AppShimMsg_LaunchApp_Done(false));
     return;
   }
 
-  if (!(profile_ = FetchProfileForDirectory(profile_dir))) {
-    Send(new AppShimMsg_LaunchApp_Done(false));
-    return;
-  }
-
-  app_id_ = app_id;
-
-  apps::AppShimHandler* handler = apps::AppShimHandler::GetForAppMode(app_id_);
-  bool success = handler && handler->OnShimLaunch(this, launch_type);
-  Send(new AppShimMsg_LaunchApp_Done(success));
+  LoadProfile(profile_dir,
+              base::Bind(&AppShimHost::LaunchAppWithProfile,
+                         weak_factory_.GetWeakPtr(), app_id, launch_type));
 }
 
 void AppShimHost::OnFocus() {
   DCHECK(CalledOnValidThread());
   apps::AppShimHandler* handler = apps::AppShimHandler::GetForAppMode(app_id_);
   if (handler)
     handler->OnShimFocus(this);
 }
 
 void AppShimHost::OnQuit() {
   DCHECK(CalledOnValidThread());
   apps::AppShimHandler* handler = apps::AppShimHandler::GetForAppMode(app_id_);
   if (handler)
     handler->OnShimQuit(this);
 }
 
-Profile* AppShimHost::FetchProfileForDirectory(
-    const base::FilePath& profile_dir) {
-  ProfileManager* profileManager = g_browser_process->profile_manager();
-  // Check for the profile name in the profile info cache to ensure that we
-  // never access any directory that isn't a known profile.
-  base::FilePath path = profileManager->user_data_dir().Append(profile_dir);
-  ProfileInfoCache& cache = profileManager->GetProfileInfoCache();
-  if (cache.GetIndexOfProfileWithPath(path) == std::string::npos) {
-    LOG(ERROR) << "Requested directory is not a known profile '"
-               << profile_dir.value() << "'.";
-    return NULL;
+void AppShimHost::LoadProfile(const base::FilePath& profile_dir,
+                              base::Callback<void(Profile*)> callback) {
+  profile_loader_.LoadProfileInvalidatingOtherLoads(
+      g_browser_process->profile_manager()->user_data_dir().Append(profile_dir),
+      callback);
+}
+
+void AppShimHost::LaunchAppWithProfile(const std::string& app_id,
+                                       apps::AppShimLaunchType launch_type,
+                                       Profile* profile) {
+  if (!profile) {

[tapted, 2013/06/11 05:31:44]

I don't think there's a way for a NULL pointer to ever pass through the
callback, the way profile_loader.cc is currently implemented. But, maybe it
needs some asynchronous error handling / error state or 'OnError' callback.

E.g. What happens if the profile has been deleted? profile_loader.cc uses
CreateProfileAsync which I think will try to recreate it, which would be bad.

[jackhou1, 2013/06/12 09:41:32]

LoadProfile now runs this callback with NULL if the profile does not exist.

+    Send(new AppShimMsg_LaunchApp_Done(false));
+    return;
   }
-  Profile* profile = profileManager->GetProfile(path);
-  if (!profile) {
-    LOG(ERROR) << "Couldn't get profile for directory '"
-               << profile_dir.value() << "'.";
-    return NULL;
-  }
-  return profile;
+
+  profile_ = profile;
+  app_id_ = app_id;
+
+  apps::AppShimHandler* handler = apps::AppShimHandler::GetForAppMode(app_id_);
+  bool success = handler && handler->OnShimLaunch(this, launch_type);
+  Send(new AppShimMsg_LaunchApp_Done(success));
 }
 
 void AppShimHost::OnAppClosed() {
   Close();
 }
 
 void AppShimHost::Close() {
   DCHECK(CalledOnValidThread());
   delete this;
 }