This patch is the rest of the lint cleanup minus the other open issue.

chrome/browser/sync/util/user_settings.cc

Index: chrome/browser/sync/util/user_settings.cc
diff --git a/chrome/browser/sync/util/user_settings.cc b/chrome/browser/sync/util/user_settings.cc
index ea8d8e484394721483fe6fd3d59bc3cbb0e7a4e9..e215c9b81a32d423232d2ba70d1604ec384dbeb6 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 {