WTF::ThreadSpecific should use base::ThreadLocalStorage.

third_party/WebKit/Source/platform/text/TextBreakIteratorICU.cpp

 /*
  * Copyright (C) 2006 Lars Knoll <lars@trolltech.com>
  * Copyright (C) 2007, 2011, 2012 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 21 matching lines @@
 #include <unicode/ubrk.h>
 
 using namespace WTF;
 
 namespace blink {
 
 class LineBreakIteratorPool final {
     USING_FAST_MALLOC(LineBreakIteratorPool);
     WTF_MAKE_NONCOPYABLE(LineBreakIteratorPool);
 public:
+    LineBreakIteratorPool() { }
+
     static LineBreakIteratorPool& sharedPool()
     {
         static WTF::ThreadSpecific<LineBreakIteratorPool>* pool = new WTF::ThreadSpecific<LineBreakIteratorPool>;
         return **pool;
     }
 
-    static PassOwnPtr<LineBreakIteratorPool> create() { return adoptPtr(new LineBreakIteratorPool); }
-
     icu::BreakIterator* take(const AtomicString& locale)
     {
         icu::BreakIterator* iterator = 0;
         for (size_t i = 0; i < m_pool.size(); ++i) {
             if (m_pool[i].first == locale) {
                 iterator = m_pool[i].second;
                 m_pool.remove(i);
                 break;
             }
         }
@@ skipping 26 matching lines @@
 
         if (m_pool.size() == capacity) {
             delete(m_pool[0].second);
             m_pool.remove(0);
         }
 
         m_pool.append(Entry(m_vendedIterators.take(iterator), iterator));
     }
 
 private:
-    LineBreakIteratorPool() { }
-
     static const size_t capacity = 4;
 
     typedef std::pair<AtomicString, icu::BreakIterator*> Entry;
     typedef Vector<Entry, capacity> Pool;
     Pool m_pool;
     HashMap<icu::BreakIterator*, AtomicString> m_vendedIterators;
-
-    friend WTF::ThreadSpecific<LineBreakIteratorPool>::operator LineBreakIteratorPool*();
 };
 
 enum TextContext { NoContext, PriorContext, PrimaryContext };
 
 const int textBufferCapacity = 16;
 
 typedef struct {
     DISALLOW_NEW();
     UText text;
     UChar buffer[textBufferCapacity];
@@ skipping 719 matching lines @@
         "$Tel1 $TelV $Tel0;"               // Telugu Virama (backward)
         "$Kan1 $KanV $Kan0;"               // Kannada Virama (backward)
         "$Mal1 $MalV $Mal0;"               // Malayalam Virama (backward)
         "!!safe_reverse;"
         "!!safe_forward;";
 
     return setUpIteratorWithRules(kRules, string, length);
 }
 
 } // namespace blink