Add a new GetInstance() method for remaining files with singleton classes under chrome/browser.

chrome/browser/speech/speech_input_manager.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/speech/speech_input_manager.h"
 
 #include <map>
 #include <string>
 
 #include "app/l10n_util.h"
 #include "base/lock.h"
 #include "base/ref_counted.h"
-#include "base/singleton.h"
+#include "base/lazy_instance.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/speech/speech_input_bubble_controller.h"
 #include "chrome/browser/speech/speech_recognizer.h"
 #include "chrome/browser/tab_contents/infobar_delegate.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tab_contents/tab_util.h"
 #include "chrome/common/pref_names.h"
 #include "grit/generated_resources.h"
@@ skipping 93 matching lines @@
   virtual void InfoBubbleFocusChanged(int caller_id);
 
  private:
   struct SpeechInputRequest {
     SpeechInputManagerDelegate* delegate;
     scoped_refptr<SpeechRecognizer> recognizer;
     bool is_active;  // Set to true when recording or recognition is going on.
   };
 
   // Private constructor to enforce singleton.
-  friend struct DefaultSingletonTraits<SpeechInputManagerImpl>;
+  friend struct base::DefaultLazyInstanceTraits<SpeechInputManagerImpl>;
   SpeechInputManagerImpl();
   virtual ~SpeechInputManagerImpl();
 
   bool HasPendingRequest(int caller_id) const;
   SpeechInputManagerDelegate* GetDelegate(int caller_id) const;
 
   void CancelRecognitionAndInformDelegate(int caller_id);
 
   // Starts/restarts recognition for an existing request.
   void StartRecognitionForRequest(int caller_id);
 
   SpeechInputManagerDelegate* delegate_;
   typedef std::map<int, SpeechInputRequest> SpeechRecognizerMap;
   SpeechRecognizerMap requests_;
   int recording_caller_id_;
   scoped_refptr<SpeechInputBubbleController> bubble_controller_;
   scoped_refptr<HardwareInfo> hardware_info_;
 };
 
+static ::base::LazyInstance<SpeechInputManagerImpl> g_speech_input_manager_impl(
+    base::LINKER_INITIALIZED);
+
 SpeechInputManager* SpeechInputManager::Get() {
-  return Singleton<SpeechInputManagerImpl>::get();
+  return g_speech_input_manager_impl.Pointer();
 }
 
 SpeechInputManagerImpl::SpeechInputManagerImpl()
     : recording_caller_id_(0),
       bubble_controller_(new SpeechInputBubbleController(
           ALLOW_THIS_IN_INITIALIZER_LIST(this))) {
 }
 
 SpeechInputManagerImpl::~SpeechInputManagerImpl() {
   while (requests_.begin() != requests_.end())
@@ skipping 170 matching lines @@
     // to the user, abort it since user has switched focus. Otherwise
     // recognition has started and keep that going so user can start speaking to
     // another element while this gets the results in parallel.
     if (recording_caller_id_ == caller_id || !requests_[caller_id].is_active) {
       CancelRecognitionAndInformDelegate(caller_id);
     }
   }
 }
 
 }  // namespace speech_input