Move ProfileLoader to chrome/browser/profiles.

apps/app_shim/app_shim_host_mac.h

 // 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.
 
 #ifndef CHROME_BROWSER_WEB_APPLICATIONS_APP_SHIM_HOST_MAC_H_
 #define CHROME_BROWSER_WEB_APPLICATIONS_APP_SHIM_HOST_MAC_H_
 
 #include <string>
 
 #include "apps/app_shim/app_shim_handler_mac.h"
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/threading/non_thread_safe.h"
+#include "chrome/browser/ui/app_list/profile_loader.h"

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

Hmm. This makes something of a circular dependency. I think we need to move
profile_loader to live under /apps, or at least higher up than app_list. It
doesn't make sense for the shim host to depend on what's currently the
app_list's profile loader. profile_loader.cc has includes:

#include "chrome/browser/lifetime/application_lifetime.h"
#include "chrome/browser/profiles/profile_manager.h"

profile_manager.h is already looped in to apps/DEPS, but I think you'll get a
presubmit/upload warning for application_lifetime.h.

So then the question becomes whether chrome::{Start,End}KeepAlive is something
that things in /apps should know about, or whether it should stay under
chrome/browser.

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

Done.

 #include "ipc/ipc_listener.h"
 #include "ipc/ipc_sender.h"
 
 class Profile;
 
 namespace IPC {
 struct ChannelHandle;
 class ChannelProxy;
 class Message;
 }  // namespace IPC
 
 // This is the counterpart to AppShimController in
 // chrome/app/chrome_main_app_mode_mac.mm. The AppShimHost owns itself, and is
 // destroyed when the app it corresponds to is closed or when the channel
 // connected to the app shim is closed.
 class AppShimHost : public IPC::Listener,
                     public IPC::Sender,
                     public apps::AppShimHandler::Host,
                     public base::NonThreadSafe {
  public:
   AppShimHost();
   virtual ~AppShimHost();
 
   // Creates a new server-side IPC channel at |handle|, which should contain a
   // file descriptor of a channel created by an IPC::ChannelFactory, and begins
   // listening for messages on it.
   void ServeChannel(const IPC::ChannelHandle& handle);
 
  protected:
+  virtual void LoadProfile(const base::FilePath& profile_dir,
+                           base::Callback<void(Profile*)> callback);
 
-  // Used internally; virtual so they can be mocked for testing.
-  virtual Profile* FetchProfileForDirectory(const base::FilePath& profile_dir);
+  virtual void LaunchAppWithProfile(const std::string& app_id,
+                                    apps::AppShimLaunchType launch_type,
+                                    Profile* profile);
 
   // IPC::Listener implementation.
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
   virtual void OnChannelError() OVERRIDE;
 
   // IPC::Sender implementation.
   virtual bool Send(IPC::Message* message) OVERRIDE;
 
  private:
   // The app shim process is requesting to be associated with the given profile
@@ skipping 16 matching lines @@
   virtual void OnAppClosed() OVERRIDE;
   virtual Profile* GetProfile() const OVERRIDE;
   virtual std::string GetAppId() const OVERRIDE;
 
   // Closes the channel and destroys the AppShimHost.
   void Close();
 
   scoped_ptr<IPC::ChannelProxy> channel_;
   std::string app_id_;
   Profile* profile_;
+  ProfileLoader profile_loader_;
+  base::WeakPtrFactory<AppShimHost> weak_factory_;
 };
 
 #endif  // CHROME_BROWSER_WEB_APPLICATIONS_APP_SHIM_HOST_MAC_H_