browser: Fix some presubmit errors.

BUG=50266
TEST=None

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

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

10 files changed, 22 insertions, 26 deletions

diff --git a/chrome/browser/autocomplete/keyword_provider.h b/chrome/browser/autocomplete/keyword_provider.h
index 7e800bb..9f7de95 100644
--- a/chrome/browser/autocomplete/keyword_provider.h
+++ b/chrome/browser/autocomplete/keyword_provider.h
@@ -47,9 +47,8 @@ class TemplateURLModel;
 // action "[keyword] %s".  If the user has typed a (possibly partial) keyword
 // but no search terms, the suggested result is shown greyed out, with
 // "<enter term(s)>" as the substituted input, and does nothing when selected.
-class KeywordProvider :
-    public AutocompleteProvider,
-    public NotificationObserver {
+class KeywordProvider : public AutocompleteProvider,
+                        public NotificationObserver {
  public:
   KeywordProvider(ACProviderListener* listener, Profile* profile);
   // For testing.
diff --git a/chrome/browser/automation/automation_extension_tracker.h b/chrome/browser/automation/automation_extension_tracker.h
index b20f6aa..8daaf7f 100644
--- a/chrome/browser/automation/automation_extension_tracker.h
+++ b/chrome/browser/automation/automation_extension_tracker.h
@@ -14,7 +14,7 @@ class Extension;
 class AutomationExtensionTracker
     : public AutomationResourceTracker<Extension*> {
  public:
-  AutomationExtensionTracker(IPC::Message::Sender* automation);
+  explicit AutomationExtensionTracker(IPC::Message::Sender* automation);
 
   virtual ~AutomationExtensionTracker();
 
diff --git a/chrome/browser/bookmarks/recently_used_folders_combo_model.h b/chrome/browser/bookmarks/recently_used_folders_combo_model.h
index 6f542dd..21bd9b7 100644
--- a/chrome/browser/bookmarks/recently_used_folders_combo_model.h
+++ b/chrome/browser/bookmarks/recently_used_folders_combo_model.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_RECENTLY_FOLDERS_COMBO_MODEL_H_
-#define CHROME_BROWSER_RECENTLY_FOLDERS_COMBO_MODEL_H_
+#ifndef CHROME_BROWSER_BOOKMARKS_RECENTLY_USED_FOLDERS_COMBO_MODEL_H_
+#define CHROME_BROWSER_BOOKMARKS_RECENTLY_USED_FOLDERS_COMBO_MODEL_H_
 #pragma once
 
 #include <vector>
@@ -22,7 +22,7 @@ class RecentlyUsedFoldersComboModel : public ComboboxModel {
   virtual int GetItemCount();
   virtual std::wstring GetItemAt(int index);
 
-  // Returns the node at the specified index.
+  // Returns the node at the specified |index|.
   const BookmarkNode* GetNodeAt(int index);
 
   // Returns the index of the original parent folder.
@@ -38,4 +38,4 @@ class RecentlyUsedFoldersComboModel : public ComboboxModel {
   DISALLOW_COPY_AND_ASSIGN(RecentlyUsedFoldersComboModel);
 };
 
-#endif  // CHROME_BROWSER_RECENTLY_FOLDERS_COMBO_MODEL_H_
+#endif  // CHROME_BROWSER_BOOKMARKS_RECENTLY_USED_FOLDERS_COMBO_MODEL_H_
diff --git a/chrome/browser/extensions/extension_bookmark_helpers.h b/chrome/browser/extensions/extension_bookmark_helpers.h
index 4f81171..7593819 100644
--- a/chrome/browser/extensions/extension_bookmark_helpers.h
+++ b/chrome/browser/extensions/extension_bookmark_helpers.h
@@ -17,9 +17,7 @@ DictionaryValue* GetNodeDictionary(const BookmarkNode* node,
                                    bool only_folders);
 
 // Add a JSON representation of |node| to the JSON |list|.
-void AddNode(const BookmarkNode* node,
-             ListValue* list,
-             bool recurse);
+void AddNode(const BookmarkNode* node, ListValue* list, bool recurse);
 
 void AddNodeFoldersOnly(const BookmarkNode* node,
                         ListValue* list,
@@ -30,6 +28,6 @@ bool RemoveNode(BookmarkModel* model,
                 bool recursive,
                 std::string* error);
 
-}
+}  // namespace extension_bookmark_helpers
 
-#endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_BOOKMARKS_HELPERS_H_
+#endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_BOOKMARK_HELPERS_H_
diff --git a/chrome/browser/geolocation/gps_location_provider_linux.h b/chrome/browser/geolocation/gps_location_provider_linux.h
index ec7dba4..68fff23 100644
--- a/chrome/browser/geolocation/gps_location_provider_linux.h
+++ b/chrome/browser/geolocation/gps_location_provider_linux.h
@@ -11,11 +11,10 @@
 #define CHROME_BROWSER_GEOLOCATION_GPS_LOCATION_PROVIDER_LINUX_H_
 #pragma once
 
-#include "chrome/browser/geolocation/location_provider.h"
-#include "chrome/common/geoposition.h"
-
 #include "base/scoped_ptr.h"
 #include "base/task.h"
+#include "chrome/browser/geolocation/location_provider.h"
+#include "chrome/common/geoposition.h"
 
 class LibGps;
 
@@ -29,7 +28,7 @@ class GpsLocationProviderLinux : public LocationProviderBase {
   typedef LibGps* (*LibGpsFactory)();
   // |factory| will be used to create the gpsd client library wrapper. (Note
   // NewGpsLocationProvider() will use the default factory).
-  GpsLocationProviderLinux(LibGpsFactory libgps_factory);
+  explicit GpsLocationProviderLinux(LibGpsFactory libgps_factory);
   virtual ~GpsLocationProviderLinux();
 
   // LocationProvider
diff --git a/chrome/browser/net/chrome_network_delegate.h b/chrome/browser/net/chrome_network_delegate.h
index 99078d6..55336d6 100644
--- a/chrome/browser/net/chrome_network_delegate.h
+++ b/chrome/browser/net/chrome_network_delegate.h
@@ -28,4 +28,4 @@ class ChromeNetworkDelegate : public net::HttpNetworkDelegate {
   DISALLOW_COPY_AND_ASSIGN(ChromeNetworkDelegate);
 };
 
-#endif // CHROME_BROWSER_NET_CHROME_NETWORK_DELEGATE_H_
+#endif  // CHROME_BROWSER_NET_CHROME_NETWORK_DELEGATE_H_
diff --git a/chrome/browser/renderer_host/audio_sync_reader.h b/chrome/browser/renderer_host/audio_sync_reader.h
index b1ce666..65c9a1c 100644
--- a/chrome/browser/renderer_host/audio_sync_reader.h
+++ b/chrome/browser/renderer_host/audio_sync_reader.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_RENDERER_HOST_AUDIO_SYNC_READER_
-#define CHROME_BROWSER_RENDERER_HOST_AUDIO_SYNC_READER_
+#ifndef CHROME_BROWSER_RENDERER_HOST_AUDIO_SYNC_READER_H_
+#define CHROME_BROWSER_RENDERER_HOST_AUDIO_SYNC_READER_H_
 #pragma once
 
 #include "base/file_descriptor_posix.h"
@@ -53,4 +53,4 @@ class AudioSyncReader : public media::AudioOutputController::SyncReader {
   DISALLOW_COPY_AND_ASSIGN(AudioSyncReader);
 };
 
-#endif  // CHROME_BROWSER_RENDERER_HOST_AUDIO_SYNC_READER_
+#endif  // CHROME_BROWSER_RENDERER_HOST_AUDIO_SYNC_READER_H_
diff --git a/chrome/browser/resources_util.h b/chrome/browser/resources_util.h
index e6cb01c..bb39973 100644
--- a/chrome/browser/resources_util.h
+++ b/chrome/browser/resources_util.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_THEME_RESOURCES_UTIL_H_
-#define CHROME_BROWSER_THEME_RESOURCES_UTIL_H_
+#ifndef CHROME_BROWSER_RESOURCES_UTIL_H_
+#define CHROME_BROWSER_RESOURCES_UTIL_H_
 #pragma once
 
 #include <string>
@@ -20,4 +20,4 @@ class ResourcesUtil {
   DISALLOW_COPY_AND_ASSIGN(ResourcesUtil);
 };
 
-#endif  // CHROME_BROWSER_THEME_RESOURCES_UTIL_H_
+#endif  // CHROME_BROWSER_RESOURCES_UTIL_H_
diff --git a/chrome/browser/scoped_pref_update.h b/chrome/browser/scoped_pref_update.h
index d9ca9c7f..9afa2c8 100644
--- a/chrome/browser/scoped_pref_update.h
+++ b/chrome/browser/scoped_pref_update.h
@@ -21,4 +21,4 @@ class ScopedPrefUpdate {
   std::wstring path_;
 };
 
-#endif
+#endif  // CHROME_BROWSER_SCOPED_PREF_UPDATE_H_
diff --git a/chrome/browser/sync/engine/syncer_types.h b/chrome/browser/sync/engine/syncer_types.h
index 3cdce9f..19be54e 100644
--- a/chrome/browser/sync/engine/syncer_types.h
+++ b/chrome/browser/sync/engine/syncer_types.h
@@ -146,7 +146,7 @@ struct SyncerEvent {
 };
 
 struct SyncerShutdownEvent {
-  SyncerShutdownEvent(Syncer *syncer_ptr) : syncer(syncer_ptr) {}
+  explicit SyncerShutdownEvent(Syncer *syncer_ptr) : syncer(syncer_ptr) {}
   Syncer* syncer;
   static bool IsChannelShutdownEvent(Syncer* syncer) {
     return true;