Remove all uses of EmptyString16(), EmptyWString(), and EmptyGURL(), and thei...

webkit/glue/simple_webmimeregistry_impl.cc

-// Copyright (c) 2009 The Chromium Authors. All rights reserved.  Use of this
+// Copyright (c) 2010 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 "webkit/glue/simple_webmimeregistry_impl.h"
 
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #include "net/base/mime_util.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebString.h"
 #include "webkit/glue/webkit_glue.h"
 
 using WebKit::WebString;
 using WebKit::WebMimeRegistry;
 
 namespace {
 
 // Convert a WebString to ASCII, falling back on an empty string in the case
 // of a non-ASCII string.
 std::string AsASCII(const WebString& string) {
   if (!IsStringASCII(string))
-    return EmptyString();
+    return std::string();
   return UTF16ToASCII(string);
 }
 
 }  // namespace
 
 namespace webkit_glue {
 
 WebMimeRegistry::SupportsType SimpleWebMimeRegistryImpl::supportsMIMEType(
     const WebString& mime_type) {
   if (!net::IsSupportedMimeType(AsASCII(mime_type).c_str()))
@@ skipping 56 matching lines @@
 
 WebString SimpleWebMimeRegistryImpl::preferredExtensionForMIMEType(
     const WebString& mime_type) {
   FilePath::StringType file_extension;
   net::GetPreferredExtensionForMimeType(AsASCII(mime_type),
                                         &file_extension);
   return FilePathStringToWebString(file_extension);
 }
 
 }  // namespace webkit_glue