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

3 files changed, 10 insertions, 11 deletions

diff --git a/chrome/browser/sync/util/event_sys-inl.h b/chrome/browser/sync/util/event_sys-inl.h
index 320a6f93..104ac85 100644
--- a/chrome/browser/sync/util/event_sys-inl.h
+++ b/chrome/browser/sync/util/event_sys-inl.h
@@ -294,12 +294,12 @@ class SimpleHookup
 template <typename EventChannel, typename EventTraits,
           typename CallbackObject, typename CallbackMethod,
           typename CallbackArg0>
-class ArgHookup :
-    public EventListenerHookupImpl<EventChannel, EventTraits,
-                                   ArgHookup<EventChannel, EventTraits,
-                                             CallbackObject,
-                                             CallbackMethod,
-                                             CallbackArg0> > {
+class ArgHookup
+    : public EventListenerHookupImpl<EventChannel, EventTraits,
+                                     ArgHookup<EventChannel, EventTraits,
+                                               CallbackObject,
+                                               CallbackMethod,
+                                               CallbackArg0> > {
  public:
   ArgHookup(EventChannel* channel, CallbackObject* cbobject,
             CallbackMethod cbmethod, CallbackArg0 arg0)
diff --git a/chrome/browser/sync/util/user_settings.cc b/chrome/browser/sync/util/user_settings.cc
index ea8d8e4..e215c9b 100644
--- a/chrome/browser/sync/util/user_settings.cc
+++ b/chrome/browser/sync/util/user_settings.cc
@@ -39,12 +39,11 @@ static const char SALT[] = "salt2";
 static const int kSaltSize = 20;
 static const int kCurrentDBVersion = 11;
 
-UserSettings::ScopedDBHandle::ScopedDBHandle(UserSettings* settings) :
-  mutex_lock_(settings->dbhandle_mutex_), handle_(&settings->dbhandle_) {
+UserSettings::ScopedDBHandle::ScopedDBHandle(UserSettings* settings)
+    : mutex_lock_(settings->dbhandle_mutex_), handle_(&settings->dbhandle_) {
 }
 
-UserSettings::UserSettings() :
-  dbhandle_(NULL) {
+UserSettings::UserSettings() : dbhandle_(NULL) {
 }
 
 string UserSettings::email() const {
diff --git a/chrome/browser/sync/util/user_settings.h b/chrome/browser/sync/util/user_settings.h
index 8f7197d..96b9f29 100644
--- a/chrome/browser/sync/util/user_settings.h
+++ b/chrome/browser/sync/util/user_settings.h
@@ -77,7 +77,7 @@ class UserSettings {
 
  protected:
   struct ScopedDBHandle {
-    ScopedDBHandle(UserSettings* settings);
+    explicit ScopedDBHandle(UserSettings* settings);
     inline sqlite3* get() const { return *handle_; }
     AutoLock mutex_lock_;
     sqlite3** const handle_;