Fixes almost all of the rest of lint errors in the chrome/ directory (minus the really hard ones which will need actual review instead of rubber-stamping.)

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

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

4 files changed, 16 insertions, 16 deletions

diff --git a/chrome/browser/metrics/metrics_log.h b/chrome/browser/metrics/metrics_log.h
index a243ce1..69b6f62 100644
--- a/chrome/browser/metrics/metrics_log.h
+++ b/chrome/browser/metrics/metrics_log.h
@@ -5,8 +5,8 @@
 // This file defines a set of user experience metrics data recorded by
 // the MetricsService.  This is the unit of data that is sent to the server.
 
-#ifndef CHROME_BROWSER_METRICS_LOG_H__
-#define CHROME_BROWSER_METRICS_LOG_H__
+#ifndef CHROME_BROWSER_METRICS_METRICS_LOG_H_
+#define CHROME_BROWSER_METRICS_METRICS_LOG_H_
 
 #include <libxml/xmlwriter.h>
 
@@ -202,4 +202,4 @@ class MetricsLog {
   DISALLOW_EVIL_CONSTRUCTORS(MetricsLog);
 };
 
-#endif  // CHROME_BROWSER_METRICS_LOG_H__
+#endif  // CHROME_BROWSER_METRICS_METRICS_LOG_H_
diff --git a/chrome/browser/metrics/metrics_response.h b/chrome/browser/metrics/metrics_response.h
index 97d5d56..e7433af 100644
--- a/chrome/browser/metrics/metrics_response.h
+++ b/chrome/browser/metrics/metrics_response.h
@@ -4,18 +4,18 @@
 
 // This class exists to interpret the response from the metrics server.
 
-#ifndef CHROME_BROWSER_METRICS_RESPONSE_H__
-#define CHROME_BROWSER_METRICS_RESPONSE_H__
+#ifndef CHROME_BROWSER_METRICS_METRICS_RESPONSE_H_
+#define CHROME_BROWSER_METRICS_METRICS_RESPONSE_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 
 class MetricsResponse {
-public:
+ public:
   // Parses metrics response XML into the information we care about
   // (how often to send metrics info, which info to send).
-  MetricsResponse(const std::string& response_xml);
+  explicit MetricsResponse(const std::string& response_xml);
 
   // True if the XML passed to the constructor was valid and parseable.
   bool valid() { return valid_; }
@@ -45,7 +45,7 @@ public:
   // in each log (in seconds).  (If 0, no value was provided.)
   int interval() { return interval_; }
 
-private:
+ private:
   bool valid_;
   int collectors_;
   int events_;
@@ -54,4 +54,4 @@ private:
   DISALLOW_EVIL_CONSTRUCTORS(MetricsResponse);
 };
 
-#endif  // CHROME_BROWSER_METRICS_RESPONSE_H__
+#endif  // CHROME_BROWSER_METRICS_METRICS_RESPONSE_H_
diff --git a/chrome/browser/metrics/metrics_service.h b/chrome/browser/metrics/metrics_service.h
index 49827ac..03b181f 100644
--- a/chrome/browser/metrics/metrics_service.h
+++ b/chrome/browser/metrics/metrics_service.h
@@ -5,8 +5,8 @@
 // This file defines a service that collects information about the user
 // experience in order to help improve future versions of the app.
 
-#ifndef CHROME_BROWSER_METRICS_SERVICE_H_
-#define CHROME_BROWSER_METRICS_SERVICE_H_
+#ifndef CHROME_BROWSER_METRICS_METRICS_SERVICE_H_
+#define CHROME_BROWSER_METRICS_METRICS_SERVICE_H_
 
 #include <list>
 #include <map>
@@ -38,7 +38,7 @@ class TemplateURLModel;
 // reported to the UMA server on next launch.
 struct ChildProcessStats {
  public:
-  ChildProcessStats(ChildProcessInfo::ProcessType type)
+  explicit ChildProcessStats(ChildProcessInfo::ProcessType type)
       : process_launches(0),
         process_crashes(0),
         instances(0),
@@ -502,4 +502,4 @@ class MetricsService : public NotificationObserver,
   DISALLOW_COPY_AND_ASSIGN(MetricsService);
 };
 
-#endif  // CHROME_BROWSER_METRICS_SERVICE_H_
+#endif  // CHROME_BROWSER_METRICS_METRICS_SERVICE_H_
diff --git a/chrome/browser/metrics/user_metrics.h b/chrome/browser/metrics/user_metrics.h
index 4c3ee38..e937b21 100644
--- a/chrome/browser/metrics/user_metrics.h
+++ b/chrome/browser/metrics/user_metrics.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_USER_METRICS_H__
-#define CHROME_BROWSER_USER_METRICS_H__
+#ifndef CHROME_BROWSER_METRICS_USER_METRICS_H_
+#define CHROME_BROWSER_METRICS_USER_METRICS_H_
 
 #include <string>
 
@@ -37,4 +37,4 @@ class UserMetrics {
                                    Profile* profile);
 };
 
-#endif  // CHROME_BROWSER_USER_METRICS_H__
+#endif  // CHROME_BROWSER_METRICS_USER_METRICS_H_