Roll base to 9e74307b276b2f9988005c0e97e85ee222586f79.

net/ftp/ftp_util.cc

 // Copyright (c) 2011 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 "net/ftp/ftp_util.h"
 
 #include <map>
 #include <vector>
 
 #include "base/i18n/case_conversion.h"
@@ skipping 114 matching lines @@
 
   return result;
 }
 
 namespace {
 
 // Lazy-initialized map of abbreviated month names.
 class AbbreviatedMonthsMap {
  public:
   static AbbreviatedMonthsMap* GetInstance() {
-    return Singleton<AbbreviatedMonthsMap>::get();
+    return base::Singleton<AbbreviatedMonthsMap>::get();
   }
 
   // Converts abbreviated month name |text| to its number (in range 1-12).
   // On success returns true and puts the number in |number|.
   bool GetMonthNumber(const base::string16& text, int* number) {
     // Ignore the case of the month names. The simplest way to handle that
     // is to make everything lowercase.
     base::string16 text_lower(base::i18n::ToLower(text));
 
     if (map_.find(text_lower) == map_.end())
       return false;
 
     *number = map_[text_lower];
     return true;
   }
 
  private:
-  friend struct DefaultSingletonTraits<AbbreviatedMonthsMap>;
+  friend struct base::DefaultSingletonTraits<AbbreviatedMonthsMap>;
 
   // Constructor, initializes the map based on ICU data. It is much faster
   // to do that just once.
   AbbreviatedMonthsMap() {
     int32_t locales_count;
     const icu::Locale* locales =
         icu::DateFormat::getAvailableLocales(locales_count);
 
     for (int32_t locale = 0; locale < locales_count; locale++) {
       UErrorCode status(U_ZERO_ERROR);
@@ skipping 203 matching lines @@
     while (!iter.end() && !u_isspace(iter.get()))
       iter.Advance();
   }
 
   base::string16 result(text.substr(iter.array_pos()));
   base::TrimWhitespace(result, base::TRIM_ALL, &result);
   return result;
 }
 
 }  // namespace