Roll base to 9e74307b276b2f9988005c0e97e85ee222586f79.

net/ftp/ftp_util.cc

Index: net/ftp/ftp_util.cc
diff --git a/net/ftp/ftp_util.cc b/net/ftp/ftp_util.cc
index 91854c4b45b09fd9d6c464a7bf8272c12b330ccf..e398d457950860477723a91965ac53e46667d0a1 100644
--- a/net/ftp/ftp_util.cc
+++ b/net/ftp/ftp_util.cc
@@ -132,7 +132,7 @@ namespace {
 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).
@@ -150,7 +150,7 @@ class AbbreviatedMonthsMap {
   }
 
  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.