Revert 289312 "Move StringToUpperASCII and LowerCaseEqualsASCII ..."

trunk/src/content/child/site_isolation_policy.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 "content/child/site_isolation_policy.h"
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
@@ skipping 49 matching lines @@
 
   data.remove_prefix(offset);
   size_t length = data.length();
 
   for (size_t sig_index = 0; sig_index < arr_size; ++sig_index) {
     const StringPiece& signature = signatures[sig_index];
     size_t signature_length = signature.length();
     if (length < signature_length)
       continue;
 
-    if (base::LowerCaseEqualsASCII(
+    if (LowerCaseEqualsASCII(
             data.begin(), data.begin() + signature_length, signature.data()))
       return true;
   }
   return false;
 }
 
 void IncrementHistogramCount(const std::string& name) {
   // The default value of min, max, bucket_count are copied from histogram.h.
   base::HistogramBase* histogram_pointer = base::Histogram::FactoryGet(
       name, 1, 100000, 50, base::HistogramBase::kUmaTargetedHistogramFlag);
@@ skipping 110 matching lines @@
   std::string no_sniff;
   info.headers->EnumerateHeader(NULL, "x-content-type-options", &no_sniff);
 
   linked_ptr<SiteIsolationResponseMetaData> resp_data(
       new SiteIsolationResponseMetaData);
   resp_data->frame_origin = frame_origin.spec();
   resp_data->response_url = response_url;
   resp_data->resource_type = resource_type;
   resp_data->canonical_mime_type = canonical_mime_type;
   resp_data->http_status_code = info.headers->response_code();
-  resp_data->no_sniff = base::LowerCaseEqualsASCII(no_sniff, "nosniff");
+  resp_data->no_sniff = LowerCaseEqualsASCII(no_sniff, "nosniff");
 
   return resp_data;
 }
 
 bool SiteIsolationPolicy::ShouldBlockResponse(
     linked_ptr<SiteIsolationResponseMetaData>& resp_data,
     const char* raw_data,
     int raw_length,
     std::string* alternative_data) {
   if (!g_policy_enabled)
@@ skipping 87 matching lines @@
     alternative_data->insert(0, " ");
     LOG(ERROR) << resp_data->response_url
                << " is blocked as an illegal cross-site document from "
                << resp_data->frame_origin;
   }
   return is_blocked;
 }
 
 SiteIsolationResponseMetaData::CanonicalMimeType
 SiteIsolationPolicy::GetCanonicalMimeType(const std::string& mime_type) {
-  if (base::LowerCaseEqualsASCII(mime_type, kTextHtml)) {
+  if (LowerCaseEqualsASCII(mime_type, kTextHtml)) {
     return SiteIsolationResponseMetaData::HTML;
   }
 
-  if (base::LowerCaseEqualsASCII(mime_type, kTextPlain)) {
+  if (LowerCaseEqualsASCII(mime_type, kTextPlain)) {
     return SiteIsolationResponseMetaData::Plain;
   }
 
-  if (base::LowerCaseEqualsASCII(mime_type, kAppJson) ||
-      base::LowerCaseEqualsASCII(mime_type, kTextJson) ||
-      base::LowerCaseEqualsASCII(mime_type, kTextXjson)) {
+  if (LowerCaseEqualsASCII(mime_type, kAppJson) ||
+      LowerCaseEqualsASCII(mime_type, kTextJson) ||
+      LowerCaseEqualsASCII(mime_type, kTextXjson)) {
     return SiteIsolationResponseMetaData::JSON;
   }
 
-  if (base::LowerCaseEqualsASCII(mime_type, kTextXml) ||
-      base::LowerCaseEqualsASCII(mime_type, xAppRssXml) ||
-      base::LowerCaseEqualsASCII(mime_type, kAppXml)) {
+  if (LowerCaseEqualsASCII(mime_type, kTextXml) ||
+      LowerCaseEqualsASCII(mime_type, xAppRssXml) ||
+      LowerCaseEqualsASCII(mime_type, kAppXml)) {
     return SiteIsolationResponseMetaData::XML;
   }
 
  return SiteIsolationResponseMetaData::Others;
 }
 
 bool SiteIsolationPolicy::IsBlockableScheme(const GURL& url) {
   // We exclude ftp:// from here. FTP doesn't provide a Content-Type
   // header which our policy depends on, so we cannot protect any
   // document from FTP servers.
@@ skipping 168 matching lines @@
   // TODO(dsjang): This is a real hack. The only purpose of this function is to
   // try to see if there's any possibility that this data can be JavaScript
   // (superset of JS). This function will be removed once UMA stats are
   // gathered.
 
   // Search for "var " for JS detection.
   return data.find("var ") != base::StringPiece::npos;
 }
 
 }  // namespace content