Merge Chromium at r12.0.742.93: Initial merge by git

Change-Id: Ic5ee2fec31358bbee305f7e915442377bfa6cda6

1 files changed, 9 insertions, 8 deletions

diff --git a/base/sys_info.h b/base/sys_info.h
index adfb250..863e068 100644
--- a/base/sys_info.h
+++ b/base/sys_info.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -6,6 +6,7 @@
 #define BASE_SYS_INFO_H_
 #pragma once
 
+#include "base/base_api.h"
 #include "base/basictypes.h"
 
 #include <string>
@@ -14,7 +15,7 @@ class FilePath;
 
 namespace base {
 
-class SysInfo {
+class BASE_API SysInfo {
  public:
   // Return the number of logical processors/cores on the current machine.
   static int NumberOfProcessors();
@@ -40,9 +41,9 @@ class SysInfo {
   // Retrieves detailed numeric values for the OS version.
   // TODO(port): Implement a Linux version of this method and enable the
   // corresponding unit test.
-  static void OperatingSystemVersionNumbers(int32 *major_version,
-                                            int32 *minor_version,
-                                            int32 *bugfix_version);
+  static void OperatingSystemVersionNumbers(int32* major_version,
+                                            int32* minor_version,
+                                            int32* bugfix_version);
 
   // Returns the CPU architecture of the system. Exact return value may differ
   // across platforms.
@@ -72,9 +73,9 @@ class SysInfo {
   // Parses /etc/lsb-release to get version information for Google Chrome OS.
   // Declared here so it can be exposed for unit testing.
   static void ParseLsbRelease(const std::string& lsb_release,
-                              int32 *major_version,
-                              int32 *minor_version,
-                              int32 *bugfix_version);
+                              int32* major_version,
+                              int32* minor_version,
+                              int32* bugfix_version);
 #endif
 };