Use std::default_delete as the default deleter for scoped_ptr.

chrome/browser/chromeos/app_mode/kiosk_app_manager.h

 // Copyright 2013 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_APP_MODE_KIOSK_APP_MANAGER_H_
 #define CHROME_BROWSER_CHROMEOS_APP_MODE_KIOSK_APP_MANAGER_H_
 
+#include <memory>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/callback_forward.h"
 #include "base/lazy_instance.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/observer_list.h"
 #include "chrome/browser/chromeos/app_mode/kiosk_app_data_delegate.h"
@@ skipping 203 matching lines @@
   // kiosk apps that are immediately auto-launched on startup.
   void SetAppWasAutoLaunchedWithZeroDelay(const std::string& app_id);
 
   // Initialize |app_session_|.
   void InitSession(Profile* profile, const std::string& app_id);
 
   AppSession* app_session() { return app_session_.get(); }
 
  private:
   friend struct base::DefaultLazyInstanceTraits<KioskAppManager>;
-  friend struct base::DefaultDeleter<KioskAppManager>;
+  friend std::default_delete<KioskAppManager>;

[danakj, 2015/11/16 22:19:03]

This seems like a weird pattern, and I'd expect instead to have the destructor
public and the constructor private with a Create() that returns a unique_ptr or
something. But I guess this is how it is.

   friend class KioskAppManagerTest;
   friend class KioskTest;
   friend class KioskUpdateTest;
 
   enum AutoLoginState {
     AUTOLOGIN_NONE      = 0,
     AUTOLOGIN_REQUESTED = 1,
     AUTOLOGIN_APPROVED  = 2,
     AUTOLOGIN_REJECTED  = 3,
   };
@@ skipping 71 matching lines @@
   base::WeakPtr<KioskAppExternalLoader> secondary_app_external_loader_;
 
   scoped_ptr<AppSession> app_session_;
 
   DISALLOW_COPY_AND_ASSIGN(KioskAppManager);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_APP_MODE_KIOSK_APP_MANAGER_H_