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

chrome/browser/autofill/contact_info.cc

 // 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 "chrome/browser/autofill/contact_info.h"
 
 #include "base/basictypes.h"
 #include "base/string_util.h"
 #include "chrome/browser/autofill/autofill_type.h"
 #include "chrome/browser/autofill/field_types.h"
@@ skipping 66 matching lines @@
   if (field_type == NAME_FIRST)
     return first();
 
   if (field_type == NAME_MIDDLE)
     return middle();
 
   if (field_type == NAME_LAST)
     return last();
 
   if (field_type == NAME_MIDDLE_INITIAL)
-    MiddleInitial();
+    return MiddleInitial();
 
   if (field_type == NAME_FULL)
     return FullName();
 
   if (field_type == NAME_SUFFIX)
     return suffix();
 
   if (field_type == EMAIL_ADDRESS)
     return email();
 
   if (field_type == COMPANY_NAME)
     return company_name();
 
-  return EmptyString16();
+  return string16();
 }
 
 void ContactInfo::SetInfo(const AutoFillType& type, const string16& value) {
   AutoFillFieldType field_type = type.field_type();
   DCHECK(type.group() == AutoFillType::CONTACT_INFO);
   if (field_type == NAME_FIRST)
     SetFirst(value);
   else if (field_type == NAME_MIDDLE)
     SetMiddle(value);
   else if (field_type == NAME_LAST)
     SetLast(value);
   else if (field_type == NAME_SUFFIX)
     set_suffix(value);
   else if (field_type == EMAIL_ADDRESS)
     email_ = value;
   else if (field_type == COMPANY_NAME)
     company_name_ = value;
   else
     NOTREACHED();
 }
 
 string16 ContactInfo::FullName() const {
   if (first_.empty())
-    return EmptyString16();
+    return string16();
 
   std::vector<string16> full_name;
   full_name.push_back(first_);
 
   if (!middle_.empty())
     full_name.push_back(middle_);
 
   if (!last_.empty())
     full_name.push_back(last_);
 
   if (!suffix_.empty())
     full_name.push_back(suffix_);
 
   return JoinString(full_name, ' ');
 }
 
 string16 ContactInfo::MiddleInitial() const {
   if (middle_.empty())
-    return EmptyString16();
+    return string16();
 
   string16 middle_name(middle());
   string16 initial;
   initial.push_back(middle_name[0]);
   return initial;
 }
 
 ContactInfo::ContactInfo(const ContactInfo& contact_info)
     : first_tokens_(contact_info.first_tokens_),
       middle_tokens_(contact_info.middle_tokens_),
@@ skipping 193 matching lines @@
 }
 
 void ContactInfo::SetLast(const string16& last) {
   last_ = last;
   last_tokens_.clear();
   Tokenize(last, kNameSplitChars, &last_tokens_);
   NameTokens::iterator iter;
   for (iter = last_tokens_.begin(); iter != last_tokens_.end(); ++iter)
     *iter = StringToLowerASCII(*iter);
 }