| Index: sandbox/linux/services/namespace_utils.h | 
| diff --git a/sandbox/linux/services/namespace_utils.h b/sandbox/linux/services/namespace_utils.h | 
| index 723103336ba0dc84270169042e0beb5cafc44a4b..ec5d24129a3a98df9b8636a340016ba2573d384f 100644 | 
| --- a/sandbox/linux/services/namespace_utils.h | 
| +++ b/sandbox/linux/services/namespace_utils.h | 
| @@ -7,9 +7,10 @@ | 
|  | 
| #include <sys/types.h> | 
|  | 
| +#include <type_traits> | 
| + | 
| #include "base/compiler_specific.h" | 
| #include "base/macros.h" | 
| -#include "base/template_util.h" | 
| #include "sandbox/sandbox_export.h" | 
|  | 
| namespace sandbox { | 
| @@ -17,7 +18,7 @@ namespace sandbox { | 
| // Utility functions for using Linux namepaces. | 
| class SANDBOX_EXPORT NamespaceUtils { | 
| public: | 
| -  static_assert((base::is_same<uid_t, gid_t>::value), | 
| +  static_assert(std::is_same<uid_t, gid_t>::value, | 
| "uid_t and gid_t must be the same type"); | 
| // generic_id_t can be used for either uid_t or gid_t. | 
| typedef uid_t generic_id_t; | 
|  |