o3d: Use char kFoo[] instead of std::wstring for static initializers.

BUG=48097
TEST=compiles

Signed-off-by: Thiago Farina <tfarina@chromium.org>

Review URL: http://codereview.chromium.org/3043004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53286 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 28 insertions, 29 deletions

diff --git a/o3d/statsreport/const-mac.h b/o3d/statsreport/const-mac.h
index 9cc2746..fba3635 100644
--- a/o3d/statsreport/const-mac.h
+++ b/o3d/statsreport/const-mac.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009, Google Inc.
+ * Copyright 2010, Google Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -31,22 +31,22 @@
 
 
 // Constants for Mac stats aggregation and uploading
-#ifndef O3D_STATSREPORT_CONST_MAC_H__
-#define O3D_STATSREPORT_CONST_MAC_H__
+#ifndef O3D_STATSREPORT_CONST_MAC_H_
+#define O3D_STATSREPORT_CONST_MAC_H_
 
 #include <string>
 #import <Cocoa/Cocoa.h>
 
 namespace stats_report {
 
-extern const std::string kCountsKeyName;
-extern const std::string kTimingsKeyName;
-extern const std::string kIntegersKeyName;
-extern const std::string kBooleansKeyName;
+extern const char kCountsKeyName[];
+extern const char kTimingsKeyName[];
+extern const char kIntegersKeyName[];
+extern const char kBooleansKeyName[];
 
 #define kLastTransmissionTimeValueName  @"LastTransmission"
 NSString* O3DStatsPath(void);
 
 }  // namespace stats_report
 
-#endif  // O3D_STATSREPORT_CONST_MAC_H__
+#endif  // O3D_STATSREPORT_CONST_MAC_H_
diff --git a/o3d/statsreport/const-mac.mm b/o3d/statsreport/const-mac.mm
index d8e9bca..b9ee601 100644
--- a/o3d/statsreport/const-mac.mm
+++ b/o3d/statsreport/const-mac.mm
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009, Google Inc.
+ * Copyright 2010, Google Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -35,11 +35,10 @@
 
 namespace stats_report {
 
-const std::string kTimingsKeyName("Timings");
-const std::string kCountsKeyName("Counts");
-const std::string kIntegersKeyName("Integers");
-const std::string kBooleansKeyName("Booleans");
-
+const char kTimingsKeyName = "Timings";
+const char kCountsKeyName = "Counts";
+const char kIntegersKeyName = "Integers";
+const char kBooleansKeyName = "Booleans";
 
 static NSString* FindGoogleAppDirectory(void) {
   NSString *applicationSupportFolder =
diff --git a/o3d/statsreport/const-posix.cc b/o3d/statsreport/const-posix.cc
index 534468b..9314b04 100644
--- a/o3d/statsreport/const-posix.cc
+++ b/o3d/statsreport/const-posix.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009, Google Inc.
+ * Copyright 2010, Google Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -35,10 +35,10 @@
 
 namespace stats_report {
 
-const std::string kTimingsKeyName("Timings");
-const std::string kCountsKeyName("Counts");
-const std::string kIntegersKeyName("Integers");
-const std::string kBooleansKeyName("Booleans");
-const std::string kLastTransmissionTimeValueName("LastTransmission");
+const char kTimingsKeyName = "Timings";
+const char kCountsKeyName = "Counts";
+const char kIntegersKeyName = "Integers";
+const char kBooleansKeyName = "Booleans";
+const char kLastTransmissionTimeValueName = "LastTransmission";
 
 }  // namespace stats_report
diff --git a/o3d/statsreport/const-posix.h b/o3d/statsreport/const-posix.h
index 271d531..e9abe24 100644
--- a/o3d/statsreport/const-posix.h
+++ b/o3d/statsreport/const-posix.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009, Google Inc.
+ * Copyright 2010, Google Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -31,19 +31,19 @@
 
 
 // Constants for Posix stats aggregation and uploading
-#ifndef O3D_STATSREPORT_CONST_POSIX_H__
-#define O3D_STATSREPORT_CONST_POSIX_H__
+#ifndef O3D_STATSREPORT_CONST_POSIX_H_
+#define O3D_STATSREPORT_CONST_POSIX_H_
 
 #include <string>
 
 namespace stats_report {
 
-extern const std::string kCountsKeyName;
-extern const std::string kTimingsKeyName;
-extern const std::string kIntegersKeyName;
-extern const std::string kBooleansKeyName;
-extern const std::string kLastTransmissionTimeValueName;
+extern const char kCountsKeyName[];
+extern const char kTimingsKeyName[];
+extern const char kIntegersKeyName[];
+extern const char kBooleansKeyName[];
+extern const char kLastTransmissionTimeValueName[];
 
 }  // namespace stats_report
 
-#endif  // O3D_STATSREPORT_CONST_POSIX_H__
+#endif  // O3D_STATSREPORT_CONST_POSIX_H_