Figure out the MIME type of shared WebUI resources more efficiently

content/browser/webui/shared_resources_data_source.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 "content/browser/webui/shared_resources_data_source.h"
 
 #include <stddef.h>
 
 #include "base/containers/hash_tables.h"
+#include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/string_util.h"
-#include "base/threading/thread_restrictions.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/url_constants.h"
-#include "net/base/mime_util.h"
 #include "ui/base/layout.h"
 #include "ui/base/webui/web_ui_util.h"
 #include "ui/resources/grit/webui_resources.h"
 #include "ui/resources/grit/webui_resources_map.h"
 
 namespace content {
 
 namespace {
 
 using ResourcesMap = base::hash_map<std::string, int>;
@@ skipping 68 matching lines @@
     std::string css = webui::GetWebUiCssTextDefaultsMd();
     bytes = base::RefCountedString::TakeString(&css);
   } else {
     bytes = GetContentClient()->GetDataResourceBytes(idr);
   }
 
   callback.Run(bytes.get());
 }
 
 std::string SharedResourcesDataSource::GetMimeType(
     const std::string& path) const {

[groby-ooo-7-16, 2016/04/29 23:39:15]

I still fail to understand why we couldn't run this on the IO thread right away.
As far as I can tell, StartDataRequest is thread-agnostic, which means we could
just return nullptr  MessageLoopForRequestPath

[Dan Beam, 2016/04/30 00:32:34]

Done.

-  // Requests should not block on the disk!  On POSIX this goes to disk.
-  // http://code.google.com/p/chromium/issues/detail?id=59849
+  if (path.empty())
+    return "text/html";
 
-  base::ThreadRestrictions::ScopedAllowIO allow_io;
-  std::string mime_type;
-  net::GetMimeTypeFromFile(base::FilePath().AppendASCII(path), &mime_type);
-  return mime_type;
+  base::FilePath filepath(path);

[groby-ooo-7-16, 2016/04/29 23:39:16]

I'd minimally prefer getting the extension once (path.Extension()) and then
compare, but not enough to make you do it unless you're bored :)

[Dan Beam, 2016/04/30 00:32:34]

Done.

+  if (filepath.MatchesExtension(".html"))

[Dan Beam, 2016/04/29 22:39:36]

list derived via magic

(`find ui/webui/resources/ ui/views/resources/default_*00_percent/common/
third_party/polymer/v1_0/components-chromium/ -type f | grep -o '\..*$' | sort |
uniq | grep -v gyp | grep -v grd | grep -v gtest | grep -v externs | grep -v
txt`)

+    return "text/html";
+
+  if (filepath.MatchesExtension(".css"))
+    return "text/css";
+
+  if (filepath.MatchesExtension(".js"))
+    return "application/javascript";
+
+  if (filepath.MatchesExtension(".png"))
+    return "image/png";
+
+  if (filepath.MatchesExtension(".gif"))
+    return "image/gif";
+
+  if (filepath.MatchesExtension(".svg"))
+    return "image/svg+xml";
+
+  if (filepath.MatchesExtension(".woff2"))
+    return "application/font-woff2";
+
+  NOTREACHED();

[groby-ooo-7-16, 2016/04/29 23:39:15]

You want to do a CHECK here to force people to notice?

[Dan Beam, 2016/04/30 00:32:34]

Done.

+  return "text/plain";
 }
 
 std::string
 SharedResourcesDataSource::GetAccessControlAllowOriginForOrigin(
     const std::string& origin) const {
   // For now we give access only for "chrome://*" origins.
   // According to CORS spec, Access-Control-Allow-Origin header doesn't support
   // wildcards, so we need to set its value explicitly by passing the |origin|
   // back.
   std::string allowed_origin_prefix = kChromeUIScheme;
   allowed_origin_prefix += "://";
   if (origin.find(allowed_origin_prefix) != 0)
     return "null";
   return origin;
 }
 
 }  // namespace content