Adding URLResponse Disk Cache to mojo.

shell/child_main.cc

 // 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.
 
 #include <unistd.h>
 
 #include "base/at_exit.h"
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/command_line.h"
@@ skipping 198 matching lines @@
   // |mojo::ErrorHandler| methods:
   void OnConnectionError() override {
     // A connection error means the connection to the shell is lost. This is not
     // recoverable.
     LOG(ERROR) << "Connection error to the shell.";
     _exit(1);
   }
 
   // |ChildController| methods:
   void StartApp(const mojo::String& app_path,
-                bool clean_app_path,
                 mojo::InterfaceRequest<mojo::Application> application_request,
                 const StartAppCallback& on_app_complete) override {
     DVLOG(2) << "ChildControllerImpl::StartApp(" << app_path << ", ...)";
     DCHECK(thread_checker_.CalledOnValidThread());
 
     on_app_complete_ = on_app_complete;
     unblocker_.Unblock(base::Bind(&ChildControllerImpl::StartAppOnMainThread,
                                   base::FilePath::FromUTF8Unsafe(app_path),
-                                  clean_app_path
-                                      ? NativeApplicationCleanup::DELETE
-                                      : NativeApplicationCleanup::DONT_DELETE,
                                   base::Passed(&application_request)));
   }
 
   void ExitNow(int32_t exit_code) override {
     DVLOG(2) << "ChildControllerImpl::ExitNow(" << exit_code << ")";
     _exit(exit_code);
   }
 
  private:
   ChildControllerImpl(AppContext* app_context,
                       const Blocker::Unblocker& unblocker)
       : app_context_(app_context),
         unblocker_(unblocker),
         channel_info_(nullptr),
         binding_(this) {
     binding_.set_error_handler(this);
   }
 
   // Callback for |mojo::embedder::CreateChannel()|.
   void DidCreateChannel(mojo::embedder::ChannelInfo* channel_info) {
     DVLOG(2) << "ChildControllerImpl::DidCreateChannel()";
     DCHECK(thread_checker_.CalledOnValidThread());
     channel_info_ = channel_info;
   }
 
   static void StartAppOnMainThread(
       const base::FilePath& app_path,
-      NativeApplicationCleanup cleanup,
       mojo::InterfaceRequest<mojo::Application> application_request) {
     // TODO(vtl): This is copied from in_process_native_runner.cc.
     DVLOG(2) << "Loading/running Mojo app from " << app_path.value()
              << " out of process";
 
     // We intentionally don't unload the native library as its lifetime is the
     // same as that of the process.
-    base::NativeLibrary app_library = LoadNativeApplication(app_path, cleanup);
+    base::NativeLibrary app_library = LoadNativeApplication(app_path);
     RunNativeApplication(app_library, application_request.Pass());
   }
 
   base::ThreadChecker thread_checker_;
   AppContext* const app_context_;
   Blocker::Unblocker unblocker_;
   StartAppCallback on_app_complete_;
 
   mojo::embedder::ChannelInfo* channel_info_;
   mojo::Binding<ChildController> binding_;
@@ skipping 28 matching lines @@
       base::Bind(&shell::ChildControllerImpl::Init,
                  base::Unretained(&app_context),
                  base::Passed(&platform_channel), blocker.GetUnblocker()));
   // This will block, then run whatever the controller wants.
   blocker.Block();
 
   app_context.Shutdown();
 
   return 0;
 }