| Index: base/sys_info_chromeos.cc
|
| diff --git a/base/sys_info_chromeos.cc b/base/sys_info_chromeos.cc
|
| index 92a3f0c4b1a5d2969d7ddcb4b4bbc6569e796ab0..5d3495488fa114edcff446e3617f5e64c586fce1 100644
|
| --- a/base/sys_info_chromeos.cc
|
| +++ b/base/sys_info_chromeos.cc
|
| @@ -10,7 +10,7 @@
|
| #include "base/lazy_instance.h"
|
| #include "base/string_number_conversions.h"
|
| #include "base/string_piece.h"
|
| -#include "base/string_tokenizer.h"
|
| +#include "base/strings/string_tokenizer.h"
|
| #include "base/threading/thread_restrictions.h"
|
|
|
| #include <execinfo.h>
|
| @@ -40,7 +40,7 @@ struct ChromeOSVersionNumbers {
|
| bool parsed;
|
| };
|
|
|
| -static base::LazyInstance<ChromeOSVersionNumbers>
|
| +static LazyInstance<ChromeOSVersionNumbers>
|
| g_chrome_os_version_numbers = LAZY_INSTANCE_INITIALIZER;
|
|
|
| // static
|
| @@ -52,7 +52,7 @@ void SysInfo::OperatingSystemVersionNumbers(int32* major_version,
|
| // See http://code.google.com/p/chromium/issues/detail?id=60394
|
| // Perhaps the caller ought to cache this?
|
| // Temporary allowing while we work the bug out.
|
| - base::ThreadRestrictions::ScopedAllowIO allow_io;
|
| + ThreadRestrictions::ScopedAllowIO allow_io;
|
|
|
| FilePath path(kLinuxStandardBaseReleaseFile);
|
| std::string contents;
|
|
|