Continuation of CL 5685007, rename the singleton accessor method in more files.

chrome/browser/chromeos/login/ownership_service.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_OWNERSHIP_SERVICE_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_OWNERSHIP_SERVICE_H_
 #pragma once
 
 #include <string>
 #include <vector>
 
-#include "base/singleton.h"
 #include "chrome/browser/chromeos/login/owner_key_utils.h"
 #include "chrome/browser/chromeos/login/owner_manager.h"
 
+namespace base {
+template <typename T> struct DefaultLazyInstanceTraits;
+}
+
 namespace chromeos {
 
 class OwnershipService {
  public:
   // Returns the singleton instance of the OwnershipService.
   static OwnershipService* GetSharedInstance();
   virtual ~OwnershipService();
 
   virtual bool IsAlreadyOwned();
 
@@ skipping 36 matching lines @@
   virtual void StartVerifyAttempt(const std::string& data,
                                   const std::vector<uint8>& signature,
                                   OwnerManager::Delegate* d);
 
   virtual bool CurrentUserIsOwner();
 
  protected:
   OwnershipService();
 
  private:
-  friend struct DefaultSingletonTraits<OwnershipService>;
+  friend struct base::DefaultLazyInstanceTraits<OwnershipService>;
   friend class OwnershipServiceTest;
 
   scoped_refptr<OwnerManager> manager_;
   scoped_refptr<OwnerKeyUtils> utils_;
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_OWNERSHIP_SERVICE_H_