Mojo: Make mojo_shell able to load apps from file: URLs.

mojo/shell/loader.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 "mojo/shell/loader.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/message_loop/message_loop.h"
 #include "mojo/shell/switches.h"
@@ skipping 16 matching lines @@
 
 Loader::Job::~Job() {
 }
 
 void Loader::Job::OnURLFetchComplete(const net::URLFetcher* source) {
   net::URLRequestStatus status = source->GetStatus();
   if (!status.is_success()) {
     LOG(ERROR) << "URL fetch didn't succeed: status = " << status.status()
                << ", error = " << status.error();
   } else if (source->GetResponseCode() != 200) {
-    LOG(ERROR) << "HTTP response not OK: code = " << source->GetResponseCode();
+    // Note: We may not have a response code (e.g., if it wasn't an http: URL).
+    LOG(WARNING) << "HTTP response not OK: code = "
+                 << source->GetResponseCode();
   }
   // TODO: Do something else in the error cases?
 
   base::FilePath app_path;
   source->GetResponseAsFilePath(true, &app_path);
   std::string mime_type;
-  std::string* passed_mime_type =
-      source->GetResponseHeaders()->GetMimeType(&mime_type) ? &mime_type : NULL;
-  delegate_->DidCompleteLoad(source->GetURL(), app_path, passed_mime_type);
+  // We may not have response headers (e.g., if it was a file: URL).
+  if (source->GetResponseHeaders())
+      source->GetResponseHeaders()->GetMimeType(&mime_type);
+  delegate_->DidCompleteLoad(source->GetURL(),
+                             app_path,
+                             mime_type.empty() ? NULL : &mime_type);
 }
 
 Loader::Loader(base::SingleThreadTaskRunner* network_runner,
                base::SingleThreadTaskRunner* file_runner,
                base::MessageLoopProxy* cache_runner,
                scoped_ptr<net::NetworkDelegate> network_delegate,
                base::FilePath base_path)
     : file_runner_(file_runner),
       url_request_context_getter_(new URLRequestContextGetter(
           base_path,
@@ skipping 22 matching lines @@
 #endif
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kDisableCache))
     job->fetcher_->SetLoadFlags(net::LOAD_DISABLE_CACHE);
   job->fetcher_->Start();
   return job.Pass();
 }
 
 }  // namespace shell
 }  // namespace mojo