Move the IsSupported* mime functions out of //net and into //components/mime_util

chrome/browser/predictors/resource_prefetch_predictor.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 "chrome/browser/predictors/resource_prefetch_predictor.h"
 
 #include <map>
 #include <set>
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
 #include "base/metrics/sparse_histogram.h"
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/time/time.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/predictors/predictor_database.h"
 #include "chrome/browser/predictors/predictor_database_factory.h"
 #include "chrome/browser/predictors/resource_prefetcher_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/url_constants.h"
 #include "components/history/core/browser/history_database.h"
 #include "components/history/core/browser/history_db_task.h"
 #include "components/history/core/browser/history_service.h"
+#include "components/mime_util/mime_util.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/resource_request_info.h"
 #include "content/public/browser/web_contents.h"
 #include "net/base/mime_util.h"
 #include "net/base/network_change_notifier.h"
 #include "net/http/http_response_headers.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_context_getter.h"
 
@@ skipping 201 matching lines @@
     net::URLRequest* response) {
   int resource_status = 0;
   if (response->first_party_for_cookies().scheme() != url::kHttpScheme)
     resource_status |= RESOURCE_STATUS_NOT_HTTP_PAGE;
 
   if (response->original_url().scheme() != url::kHttpScheme)
     resource_status |= RESOURCE_STATUS_NOT_HTTP_RESOURCE;
 
   std::string mime_type;
   response->GetMimeType(&mime_type);
-  if (!mime_type.empty() &&
-      !net::IsSupportedImageMimeType(mime_type.c_str()) &&
-      !net::IsSupportedJavascriptMimeType(mime_type.c_str()) &&
+  if (!mime_type.empty() && !mime_util::IsSupportedImageMimeType(mime_type) &&
+      !mime_util::IsSupportedJavascriptMimeType(mime_type) &&
       !net::MatchesMimeType("text/css", mime_type)) {
     resource_status |= RESOURCE_STATUS_UNSUPPORTED_MIME_TYPE;
   }
 
   if (response->method() != "GET")
     resource_status |= RESOURCE_STATUS_NOT_GET;
 
   if (response->original_url().spec().length() >
       ResourcePrefetchPredictorTables::kMaxStringLength) {
     resource_status |= RESOURCE_STATUS_URL_TOO_LONG;
@@ skipping 26 matching lines @@
   response_time += base::TimeDelta::FromSeconds(1);
   base::TimeDelta freshness =
       response_info.headers->GetFreshnessLifetimes(response_time).freshness;
   return freshness > base::TimeDelta();
 }
 
 // static
 content::ResourceType ResourcePrefetchPredictor::GetResourceTypeFromMimeType(
     const std::string& mime_type,
     content::ResourceType fallback) {
-  if (net::IsSupportedImageMimeType(mime_type.c_str()))
+  if (mime_util::IsSupportedImageMimeType(mime_type))
     return content::RESOURCE_TYPE_IMAGE;
-  else if (net::IsSupportedJavascriptMimeType(mime_type.c_str()))
+  else if (mime_util::IsSupportedJavascriptMimeType(mime_type))
     return content::RESOURCE_TYPE_SCRIPT;
   else if (net::MatchesMimeType("text/css", mime_type))
     return content::RESOURCE_TYPE_STYLESHEET;
   else
     return fallback;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ResourcePrefetchPredictor structs.
 
@@ skipping 1026 matching lines @@
     // HistoryService is already loaded. Continue with Initialization.
     OnHistoryAndCacheLoaded();
     return;
   }
   DCHECK(!history_service_observer_.IsObserving(history_service));
   history_service_observer_.Add(history_service);
   return;
 }
 
 }  // namespace predictors