| Index: chrome/browser/sync_file_system/drive_backend/callback_helper.h
|
| diff --git a/chrome/browser/sync_file_system/drive_backend/callback_helper.h b/chrome/browser/sync_file_system/drive_backend/callback_helper.h
|
| index 8d524d477642aef79caa646d395d231bb8e4e782..d976accdfb305c66f66a9dab9a907f2d9e611a0e 100644
|
| --- a/chrome/browser/sync_file_system/drive_backend/callback_helper.h
|
| +++ b/chrome/browser/sync_file_system/drive_backend/callback_helper.h
|
| @@ -5,6 +5,8 @@
|
| #ifndef CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_CALLBACK_HELPER_H_
|
| #define CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_CALLBACK_HELPER_H_
|
|
|
| +#include <type_traits>
|
| +
|
| #include "base/bind.h"
|
| #include "base/location.h"
|
| #include "base/logging.h"
|
| @@ -19,17 +21,14 @@ namespace drive_backend {
|
| namespace internal {
|
|
|
| template <typename T>
|
| -typename base::enable_if<
|
| - base::internal::IsMoveOnlyType<T>::value,
|
| - base::internal::PassedWrapper<T> >::type
|
| +typename std::enable_if<base::internal::IsMoveOnlyType<T>::value,
|
| + base::internal::PassedWrapper<T>>::type
|
| RebindForward(T& t) {
|
| return base::Passed(&t);
|
| }
|
|
|
| template <typename T>
|
| -typename base::enable_if<
|
| - !base::internal::IsMoveOnlyType<T>::value,
|
| - T&>::type
|
| +typename std::enable_if<!base::internal::IsMoveOnlyType<T>::value, T&>::type
|
| RebindForward(T& t) {
|
| return t;
|
| }
|
|
|