More shell cleanup: Move NativeRunner(Factory) to native_runner.h.

shell/application_manager/application_manager.h

 // Copyright 2014 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 SHELL_APPLICATION_MANAGER_APPLICATION_MANAGER_H_
 #define SHELL_APPLICATION_MANAGER_APPLICATION_MANAGER_H_
 
 #include <map>
 
-#include "base/basictypes.h"
-#include "base/callback.h"
-#include "base/gtest_prod_util.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
+#include "mojo/public/interfaces/application/application.mojom.h"
 #include "mojo/public/interfaces/application/service_provider.mojom.h"
 #include "mojo/services/network/public/interfaces/network_service.mojom.h"
 #include "shell/application_manager/application_loader.h"
-#include "shell/application_manager/fetcher.h"
-#include "shell/application_manager/shell_impl.h"
+#include "shell/application_manager/native_runner.h"
 #include "url/gurl.h"
 
 namespace base {
 class FilePath;
 class SequencedWorkerPool;
 }
 
 namespace mojo {
 namespace shell {
 
-// ApplicationManager requires implementations of NativeRunner and
-// NativeRunnerFactory to run native applications.
-class NativeRunner {
- public:
-  // Parameter for |Start()| to specify its cleanup behavior.
-  enum CleanupBehavior { DeleteAppPath, DontDeleteAppPath };
-
-  virtual ~NativeRunner() {}
-
-  // Loads the app in the file at |app_path| and runs it on some other
-  // thread/process. If |cleanup_behavior| is |true|, takes ownership of the
-  // file. |app_completed_callback| is posted (to the thread on which |Start()|
-  // was called) after |MojoMain()| completes.
-  // TODO(vtl): |app_path| and |cleanup_behavior| should probably be moved to
-  // the factory's Create(). Rationale: The factory may need information from
-  // the file to decide what kind of NativeRunner to make.
-  virtual void Start(const base::FilePath& app_path,
-                     CleanupBehavior cleanup_behavior,
-                     InterfaceRequest<Application> application_request,
-                     const base::Closure& app_completed_callback) = 0;
-};
-
-class NativeRunnerFactory {
- public:
-  // Options for running the native app. (This will contain, e.g., information
-  // about the sandbox profile, etc.)
-  struct Options {
-    // Constructs with default options.
-    Options() : force_in_process(false) {}
-
-    bool force_in_process;
-  };
-
-  virtual ~NativeRunnerFactory() {}
-  virtual scoped_ptr<NativeRunner> Create(const Options& options) = 0;
-};
+class Fetcher;
+class ShellImpl;
 
 class ApplicationManager {
  public:
   class Delegate {
    public:
     virtual ~Delegate();
     // Send when the Application holding the handle on the other end of the
     // Shell pipe goes away.
     virtual void OnApplicationError(const GURL& url);
     virtual GURL ResolveURL(const GURL& url);
@@ skipping 126 matching lines @@
                        const GURL& resolved_url,
                        const GURL& requestor_url,
                        InterfaceRequest<ServiceProvider> services,
                        ServiceProviderPtr exposed_services);
 
   void HandleFetchCallback(const GURL& requested_url,
                            const GURL& requestor_url,
                            InterfaceRequest<ServiceProvider> services,
                            ServiceProviderPtr exposed_services,
                            NativeRunner::CleanupBehavior cleanup_behavior,
                            scoped_ptr<Fetcher> fetcher);

[qsr, 2015/03/05 14:13:19]

I though scoped_ptr needed the full implementation available. How it is that you
can just forward declare fetcher now?

[jamesr, 2015/03/05 17:36:12]

scoped_ptr<T>::reset() (which is called by ~scoped_ptr<T>) needs the full
definition of T.  Here, the function is out-of-line so reset() is invoked by the
definition of the function, not the declaration. thus the .cc needs to see the
full type of T but not the declaration of the function signature. if this was
inlined then it would need T

 
   void RunNativeApplication(InterfaceRequest<Application> application_request,
                             const NativeRunnerFactory::Options& options,
                             NativeRunner::CleanupBehavior cleanup_behavior,
                             scoped_ptr<Fetcher> fetcher,
                             const base::FilePath& file_path,
                             bool path_exists);
 
   void LoadWithContentHandler(const GURL& content_handler_url,
                               InterfaceRequest<Application> application_request,
@@ skipping 33 matching lines @@
   ScopedVector<NativeRunner> native_runners_;
   bool disable_cache_;
 
   DISALLOW_COPY_AND_ASSIGN(ApplicationManager);
 };
 
 }  // namespace shell
 }  // namespace mojo
 
 #endif  // SHELL_APPLICATION_MANAGER_APPLICATION_MANAGER_H_