Move Singleton and related structs to namespace base

net/spdy/hpack/hpack_constants.cc

 // Copyright 2014 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/spdy/hpack/hpack_constants.h"
 
 #include <vector>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 11 matching lines @@
  public:
   SharedHpackHuffmanTable() {
     std::vector<HpackHuffmanSymbol> code = HpackHuffmanCode();
     scoped_ptr<HpackHuffmanTable> mutable_table(new HpackHuffmanTable());
     CHECK(mutable_table->Initialize(&code[0], code.size()));
     CHECK(mutable_table->IsInitialized());
     table.reset(mutable_table.release());
   }
 
   static SharedHpackHuffmanTable* GetInstance() {
-    return Singleton<SharedHpackHuffmanTable>::get();
+    return base::Singleton<SharedHpackHuffmanTable>::get();
   }
 
   scoped_ptr<const HpackHuffmanTable> table;
 };
 
 // SharedHpackStaticTable is a Singleton wrapping a HpackStaticTable
 // instance initialized with |kHpackStaticTable|.
 struct SharedHpackStaticTable {
  public:
   SharedHpackStaticTable() {
     std::vector<HpackStaticEntry> static_table = HpackStaticTableVector();
     scoped_ptr<HpackStaticTable> mutable_table(new HpackStaticTable());
     mutable_table->Initialize(&static_table[0], static_table.size());
     CHECK(mutable_table->IsInitialized());
     table.reset(mutable_table.release());
   }
 
   static SharedHpackStaticTable* GetInstance() {
-    return Singleton<SharedHpackStaticTable>::get();
+    return base::Singleton<SharedHpackStaticTable>::get();
   }
 
   scoped_ptr<const HpackStaticTable> table;
 };
 
 }  // namespace
 
 // Produced by applying the python program [1] with tables
 // provided by [2] (inserted into the source of the python program)
 // and copy-paste them into this file.
@@ skipping 344 matching lines @@
 
 const HpackHuffmanTable& ObtainHpackHuffmanTable() {
   return *SharedHpackHuffmanTable::GetInstance()->table;
 }
 
 const HpackStaticTable& ObtainHpackStaticTable() {
   return *SharedHpackStaticTable::GetInstance()->table;
 }
 
 }  // namespace net