| Index: base/sys_info.h | 
| =================================================================== | 
| --- base/sys_info.h	(revision 156435) | 
| +++ base/sys_info.h	(working copy) | 
| @@ -5,15 +5,14 @@ | 
| #ifndef BASE_SYS_INFO_H_ | 
| #define BASE_SYS_INFO_H_ | 
|  | 
| +#include <string> | 
| + | 
| #include "base/base_export.h" | 
| #include "base/basictypes.h" | 
| #include "base/file_path.h" | 
| #include "base/time.h" | 
| +#include "build/build_config.h" | 
|  | 
| -#include <string> | 
| - | 
| -class FilePath; | 
| - | 
| namespace base { | 
|  | 
| class BASE_EXPORT SysInfo { | 
| @@ -66,7 +65,7 @@ | 
| #if defined(OS_POSIX) && !defined(OS_MACOSX) | 
| // Returns the maximum SysV shared memory segment size. | 
| static size_t MaxSharedMemorySize(); | 
| -#endif // defined(OS_POSIX) && !defined(OS_MACOSX) | 
| +#endif  // defined(OS_POSIX) && !defined(OS_MACOSX) | 
|  | 
| #if defined(OS_CHROMEOS) | 
| // Returns the name of the version entry we wish to look up in the | 
| @@ -82,7 +81,7 @@ | 
|  | 
| // Returns the path to the lsb-release file. | 
| static FilePath GetLsbReleaseFilePath(); | 
| -#endif // defined(OS_CHROMEOS) | 
| +#endif  // defined(OS_CHROMEOS) | 
|  | 
| #if defined(OS_ANDROID) | 
| // Returns the Android build's codename. | 
| @@ -95,7 +94,7 @@ | 
| static std::string GetDeviceName(); | 
|  | 
| static int DalvikHeapSizeMB(); | 
| -#endif // defined(OS_ANDROID) | 
| +#endif  // defined(OS_ANDROID) | 
| }; | 
|  | 
| }  // namespace base | 
|  |