Avoid disk accesses on the wrong thread in URLRequestFileJob

net/base/mime_util.cc

 // Copyright (c) 2012 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 <map>
 #include <string>
 
 #include "net/base/mime_util.h"
 #include "net/base/platform_mime_util.h"
 
@@ skipping 68 matching lines @@
   MimeMappings image_map_;
   MimeMappings media_map_;
   MimeMappings non_image_map_;
   MimeMappings javascript_map_;
   MimeMappings view_source_map_;
   MimeMappings codecs_map_;
 
   StrictMappings strict_format_map_;
 };  // class MimeUtil
 
-static base::LazyInstance<MimeUtil> g_mime_util = LAZY_INSTANCE_INITIALIZER;
+static base::LazyInstance<MimeUtil>::Leaky g_mime_util =

[eroman, 2012/07/12 19:13:16]

Please add a comment explaining that it is Leaky in order to allow usage on
worker threads

+    LAZY_INSTANCE_INITIALIZER;
 
 struct MimeInfo {
   const char* mime_type;
   const char* extensions;  // comma separated list
 };
 
 static const MimeInfo primary_mappings[] = {
   { "text/html", "html,htm" },
   { "text/css", "css" },
   { "text/xml", "xml" },
@@ skipping 730 matching lines @@
 // Unless/until WebM files are added to the media layout tests, we need to avoid
 // blacklisting mp4 and H.264 when Theora is not supported (and proprietary
 // codecs are) so that the media tests can still run.
 #if defined(ENABLE_MEDIA_CODEC_THEORA) || !defined(USE_PROPRIETARY_CODECS)
   for (size_t i = 0; i < arraysize(proprietary_media_codecs); ++i)
     codecs->push_back(proprietary_media_codecs[i]);
 #endif
 }
 
 }  // namespace net