Style cleanup in preparation for auto-linting base/.

BUG=none
TEST=none

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

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

49 files changed, 193 insertions, 167 deletions

diff --git a/base/at_exit.h b/base/at_exit.h
index 48ba3d9..082525e 100644
--- a/base/at_exit.h
+++ b/base/at_exit.h
@@ -32,7 +32,7 @@ class AtExitManager {
   // even if one already exists.  This should only be used for testing!
   // AtExitManagers are kept on a global stack, and it will be removed during
   // destruction.  This allows you to shadow another AtExitManager.
-  AtExitManager(bool shadow);
+  explicit AtExitManager(bool shadow);
 
  public:
   typedef void (*AtExitCallbackType)(void*);
diff --git a/base/compat_execinfo.h b/base/compat_execinfo.h
index c615cf2..348c5cd 100644
--- a/base/compat_execinfo.h
+++ b/base/compat_execinfo.h
@@ -5,8 +5,8 @@
 // A file you can include instead of <execinfo.h> if your project might need
 // to run on Mac OS X 10.4.
 
-#ifndef BASE_COMPAT_EXECINFO_H
-#define BASE_COMPAT_EXECINFO_H
+#ifndef BASE_COMPAT_EXECINFO_H_
+#define BASE_COMPAT_EXECINFO_H_
 
 #include "build/build_config.h"
 
@@ -30,4 +30,4 @@ extern void backtrace_symbols_fd(void* const*, int, int)
 #include <execinfo.h>
 #endif
 
-#endif  // BASE_COMPAT_EXECINFO_H
+#endif  // BASE_COMPAT_EXECINFO_H_
diff --git a/base/crypto/rsa_private_key.cc b/base/crypto/rsa_private_key.cc
index e6faa3e..0c83b37 100644
--- a/base/crypto/rsa_private_key.cc
+++ b/base/crypto/rsa_private_key.cc
@@ -53,7 +53,7 @@ void PrivateKeyInfoCodec::PrependBytes(uint8* val,
                                        int start,
                                        int num_bytes,
                                        std::list<uint8>* data) {
-  while(num_bytes > 0) {
+  while (num_bytes > 0) {
     --num_bytes;
     data->push_front(val[start + num_bytes]);
   }
@@ -288,7 +288,7 @@ void PrivateKeyInfoCodec::PrependIntegerImpl(uint8* val,
    reverse(tmp.begin(), tmp.end());
    val = &tmp.front();
  }
-                                               
+
   // ASN.1 integers are unpadded byte arrays, so skip any null padding bytes
   // from the most-significant end of the integer.
   int start = 0;
@@ -360,7 +360,7 @@ bool PrivateKeyInfoCodec::ReadIntegerWithExpectedSize(uint8** pos,
     READ_ASSERT(out->size() <= expected_size);
   }
 
-  while(pad) {
+  while (pad) {
     out->push_back(0x00);
     pad--;
   }
diff --git a/base/eintr_wrapper.h b/base/eintr_wrapper.h
index a3fb1e4..d2aee11 100644
--- a/base/eintr_wrapper.h
+++ b/base/eintr_wrapper.h
@@ -30,4 +30,4 @@
 
 #endif  // OS_POSIX
 
-#endif  // !BASE_EINTR_WRAPPER_H_
+#endif  // BASE_EINTR_WRAPPER_H_
diff --git a/base/event_recorder.cc b/base/event_recorder.cc
index 92128af..7c3336b 100644
--- a/base/event_recorder.cc
+++ b/base/event_recorder.cc
@@ -179,7 +179,7 @@ LRESULT EventRecorder::RecordWndProc(int nCode, WPARAM wParam, LPARAM lParam) {
 
   // The Journal Recorder must stop recording events when system modal
   // dialogs are present. (see msdn link above)
-  switch(nCode) {
+  switch (nCode) {
     case HC_SYSMODALON:
       recording_enabled = false;
       break;
@@ -205,7 +205,7 @@ LRESULT EventRecorder::PlaybackWndProc(int nCode, WPARAM wParam,
   static bool playback_enabled = true;
   int delay = 0;
 
-  switch(nCode) {
+  switch (nCode) {
     // A system modal dialog box is being displayed.  Stop playing back
     // messages.
     case HC_SYSMODALON:
diff --git a/base/file_descriptor_shuffle.h b/base/file_descriptor_shuffle.h
index 2592b80..e0cb88b 100644
--- a/base/file_descriptor_shuffle.h
+++ b/base/file_descriptor_shuffle.h
@@ -76,4 +76,4 @@ static inline bool ShuffleFileDescriptors(const InjectiveMultimap& map) {
 
 }  // namespace base
 
-#endif  // !BASE_FILE_DESCRIPTOR_SHUFFLE_H_
+#endif  // BASE_FILE_DESCRIPTOR_SHUFFLE_H_
diff --git a/base/image_util.h b/base/image_util.h
index 0fd4a8f..7e55358 100644
--- a/base/image_util.h
+++ b/base/image_util.h
@@ -18,8 +18,8 @@ namespace image_util {
 
 // Contains both the PE section name (.text, .reloc etc) and its size.
 struct ImageSectionData {
-  ImageSectionData (const std::string& section_name, size_t section_size)
-      : name (section_name),
+  ImageSectionData(const std::string& section_name, size_t section_size)
+      : name(section_name),
         size_in_bytes(section_size) {
   }
 
diff --git a/base/keyboard_code_conversion_gtk.cc b/base/keyboard_code_conversion_gtk.cc
index 28727c4..f5f04c8 100644
--- a/base/keyboard_code_conversion_gtk.cc
+++ b/base/keyboard_code_conversion_gtk.cc
@@ -57,7 +57,7 @@ base::KeyboardCode WindowsKeyCodeForGdkKeyCode(int keycode) {
     case GDK_KP_4:
       return VKEY_NUMPAD4;  // (64) Numeric keypad 4 key
     case GDK_KP_5:
-      return VKEY_NUMPAD5;  //(65) Numeric keypad 5 key
+      return VKEY_NUMPAD5;  // (65) Numeric keypad 5 key
     case GDK_KP_6:
       return VKEY_NUMPAD6;  // (66) Numeric keypad 6 key
     case GDK_KP_7:
@@ -78,190 +78,190 @@ base::KeyboardCode WindowsKeyCodeForGdkKeyCode(int keycode) {
       return VKEY_DIVIDE; // (6F) Divide key
 
     case GDK_BackSpace:
-      return VKEY_BACK; // (08) BACKSPACE key
+      return VKEY_BACK;  // (08) BACKSPACE key
     case GDK_ISO_Left_Tab:
     case GDK_3270_BackTab:
     case GDK_Tab:
-      return VKEY_TAB; // (09) TAB key
+      return VKEY_TAB;  // (09) TAB key
     case GDK_Clear:
-      return VKEY_CLEAR; // (0C) CLEAR key
+      return VKEY_CLEAR;  // (0C) CLEAR key
     case GDK_ISO_Enter:
     case GDK_KP_Enter:
     case GDK_Return:
-      return VKEY_RETURN; //(0D) Return key
+      return VKEY_RETURN;  // (0D) Return key
     case GDK_Shift_L:
     case GDK_Shift_R:
-      return VKEY_SHIFT; // (10) SHIFT key
+      return VKEY_SHIFT;  // (10) SHIFT key
     case GDK_Control_L:
     case GDK_Control_R:
-      return VKEY_CONTROL; // (11) CTRL key
+      return VKEY_CONTROL;  // (11) CTRL key
     case GDK_Menu:
     case GDK_Alt_L:
     case GDK_Alt_R:
-      return VKEY_MENU; // (12) ALT key
+      return VKEY_MENU;  // (12) ALT key
 
     case GDK_Pause:
-      return VKEY_PAUSE; // (13) PAUSE key
+      return VKEY_PAUSE;  // (13) PAUSE key
     case GDK_Caps_Lock:
-      return VKEY_CAPITAL; // (14) CAPS LOCK key
+      return VKEY_CAPITAL;  // (14) CAPS LOCK key
     case GDK_Kana_Lock:
     case GDK_Kana_Shift:
-      return VKEY_KANA; // (15) Input Method Editor (IME) Kana mode
+      return VKEY_KANA;  // (15) Input Method Editor (IME) Kana mode
     case GDK_Hangul:
-      return VKEY_HANGUL; // VKEY_HANGUL (15) IME Hangul mode
+      return VKEY_HANGUL;  // VKEY_HANGUL (15) IME Hangul mode
       // VKEY_JUNJA (17) IME Junja mode
       // VKEY_FINAL (18) IME final mode
     case GDK_Hangul_Hanja:
-      return VKEY_HANJA; // (19) IME Hanja mode
+      return VKEY_HANJA;  // (19) IME Hanja mode
     case GDK_Kanji:
-      return VKEY_KANJI; // (19) IME Kanji mode
+      return VKEY_KANJI;  // (19) IME Kanji mode
     case GDK_Escape:
-      return VKEY_ESCAPE; // (1B) ESC key
+      return VKEY_ESCAPE;  // (1B) ESC key
       // VKEY_CONVERT (1C) IME convert
       // VKEY_NONCONVERT (1D) IME nonconvert
       // VKEY_ACCEPT (1E) IME accept
       // VKEY_MODECHANGE (1F) IME mode change request
     case GDK_space:
-      return VKEY_SPACE; // (20) SPACEBAR
+      return VKEY_SPACE;  // (20) SPACEBAR
     case GDK_Page_Up:
-      return VKEY_PRIOR; // (21) PAGE UP key
+      return VKEY_PRIOR;  // (21) PAGE UP key
     case GDK_Page_Down:
-      return VKEY_NEXT; // (22) PAGE DOWN key
+      return VKEY_NEXT;  // (22) PAGE DOWN key
     case GDK_End:
-      return VKEY_END; // (23) END key
+      return VKEY_END;  // (23) END key
     case GDK_Home:
-      return VKEY_HOME; // (24) HOME key
+      return VKEY_HOME;  // (24) HOME key
     case GDK_Left:
-      return VKEY_LEFT; // (25) LEFT ARROW key
+      return VKEY_LEFT;  // (25) LEFT ARROW key
     case GDK_Up:
-      return VKEY_UP; // (26) UP ARROW key
+      return VKEY_UP;  // (26) UP ARROW key
     case GDK_Right:
-      return VKEY_RIGHT; // (27) RIGHT ARROW key
+      return VKEY_RIGHT;  // (27) RIGHT ARROW key
     case GDK_Down:
-      return VKEY_DOWN; // (28) DOWN ARROW key
+      return VKEY_DOWN;  // (28) DOWN ARROW key
     case GDK_Select:
-      return VKEY_SELECT; // (29) SELECT key
+      return VKEY_SELECT;  // (29) SELECT key
     case GDK_Print:
-      return VKEY_PRINT; // (2A) PRINT key
+      return VKEY_PRINT;  // (2A) PRINT key
     case GDK_Execute:
-      return VKEY_EXECUTE;// (2B) EXECUTE key
-      //dunno on this
-      //case GDK_PrintScreen:
+      return VKEY_EXECUTE;  // (2B) EXECUTE key
+      // dunno on this
+      // case GDK_PrintScreen:
       //      return VKEY_SNAPSHOT; // (2C) PRINT SCREEN key
     case GDK_Insert:
-      return VKEY_INSERT; // (2D) INS key
+      return VKEY_INSERT;  // (2D) INS key
     case GDK_Delete:
-      return VKEY_DELETE; // (2E) DEL key
+      return VKEY_DELETE;  // (2E) DEL key
     case GDK_Help:
-      return VKEY_HELP; // (2F) HELP key
+      return VKEY_HELP;  // (2F) HELP key
     case GDK_0:
     case GDK_parenright:
-      return VKEY_0;    //  (30) 0) key
+      return VKEY_0;  // (30) 0) key
     case GDK_1:
     case GDK_exclam:
-      return VKEY_1; //  (31) 1 ! key
+      return VKEY_1;  // (31) 1 ! key
     case GDK_2:
     case GDK_at:
-      return VKEY_2; //  (32) 2 & key
+      return VKEY_2;  // (32) 2 & key
     case GDK_3:
     case GDK_numbersign:
-      return VKEY_3; //case '3': case '#';
+      return VKEY_3;  // case '3': case '#';
     case GDK_4:
-    case GDK_dollar: //  (34) 4 key '$';
+    case GDK_dollar:  // (34) 4 key '$';
       return VKEY_4;
     case GDK_5:
     case GDK_percent:
-      return VKEY_5; //  (35) 5 key  '%'
+      return VKEY_5;  // (35) 5 key  '%'
     case GDK_6:
     case GDK_asciicircum:
-      return VKEY_6; //  (36) 6 key  '^'
+      return VKEY_6;  // (36) 6 key  '^'
     case GDK_7:
     case GDK_ampersand:
-      return VKEY_7; //  (37) 7 key  case '&'
+      return VKEY_7;  // (37) 7 key  case '&'
     case GDK_8:
     case GDK_asterisk:
-      return VKEY_8; //  (38) 8 key  '*'
+      return VKEY_8;  // (38) 8 key  '*'
     case GDK_9:
     case GDK_parenleft:
-      return VKEY_9; //  (39) 9 key '('
+      return VKEY_9;  // (39) 9 key '('
     case GDK_a:
     case GDK_A:
-      return VKEY_A; //  (41) A key case 'a': case 'A': return 0x41;
+      return VKEY_A;  // (41) A key case 'a': case 'A': return 0x41;
     case GDK_b:
     case GDK_B:
-      return VKEY_B; //  (42) B key case 'b': case 'B': return 0x42;
+      return VKEY_B;  // (42) B key case 'b': case 'B': return 0x42;
     case GDK_c:
     case GDK_C:
-      return VKEY_C; //  (43) C key case 'c': case 'C': return 0x43;
+      return VKEY_C;  // (43) C key case 'c': case 'C': return 0x43;
     case GDK_d:
     case GDK_D:
-      return VKEY_D; //  (44) D key case 'd': case 'D': return 0x44;
+      return VKEY_D;  // (44) D key case 'd': case 'D': return 0x44;
     case GDK_e:
     case GDK_E:
-      return VKEY_E; //  (45) E key case 'e': case 'E': return 0x45;
+      return VKEY_E;  // (45) E key case 'e': case 'E': return 0x45;
     case GDK_f:
     case GDK_F:
-      return VKEY_F; //  (46) F key case 'f': case 'F': return 0x46;
+      return VKEY_F;  // (46) F key case 'f': case 'F': return 0x46;
     case GDK_g:
     case GDK_G:
-      return VKEY_G; //  (47) G key case 'g': case 'G': return 0x47;
+      return VKEY_G;  // (47) G key case 'g': case 'G': return 0x47;
     case GDK_h:
     case GDK_H:
-      return VKEY_H; //  (48) H key case 'h': case 'H': return 0x48;
+      return VKEY_H;  // (48) H key case 'h': case 'H': return 0x48;
     case GDK_i:
     case GDK_I:
-      return VKEY_I; //  (49) I key case 'i': case 'I': return 0x49;
+      return VKEY_I;  // (49) I key case 'i': case 'I': return 0x49;
     case GDK_j:
     case GDK_J:
-      return VKEY_J; //  (4A) J key case 'j': case 'J': return 0x4A;
+      return VKEY_J;  // (4A) J key case 'j': case 'J': return 0x4A;
     case GDK_k:
     case GDK_K:
-      return VKEY_K; //  (4B) K key case 'k': case 'K': return 0x4B;
+      return VKEY_K;  // (4B) K key case 'k': case 'K': return 0x4B;
     case GDK_l:
     case GDK_L:
-      return VKEY_L; //  (4C) L key case 'l': case 'L': return 0x4C;
+      return VKEY_L;  // (4C) L key case 'l': case 'L': return 0x4C;
     case GDK_m:
     case GDK_M:
-      return VKEY_M; //  (4D) M key case 'm': case 'M': return 0x4D;
+      return VKEY_M;  // (4D) M key case 'm': case 'M': return 0x4D;
     case GDK_n:
     case GDK_N:
-      return VKEY_N; //  (4E) N key case 'n': case 'N': return 0x4E;
+      return VKEY_N;  // (4E) N key case 'n': case 'N': return 0x4E;
     case GDK_o:
     case GDK_O:
-      return VKEY_O; //  (4F) O key case 'o': case 'O': return 0x4F;
+      return VKEY_O;  // (4F) O key case 'o': case 'O': return 0x4F;
     case GDK_p:
     case GDK_P:
-      return VKEY_P; //  (50) P key case 'p': case 'P': return 0x50;
+      return VKEY_P;  // (50) P key case 'p': case 'P': return 0x50;
     case GDK_q:
     case GDK_Q:
-      return VKEY_Q; //  (51) Q key case 'q': case 'Q': return 0x51;
+      return VKEY_Q;  // (51) Q key case 'q': case 'Q': return 0x51;
     case GDK_r:
     case GDK_R:
-      return VKEY_R; //  (52) R key case 'r': case 'R': return 0x52;
+      return VKEY_R;  // (52) R key case 'r': case 'R': return 0x52;
     case GDK_s:
     case GDK_S:
-      return VKEY_S; //  (53) S key case 's': case 'S': return 0x53;
+      return VKEY_S;  // (53) S key case 's': case 'S': return 0x53;
     case GDK_t:
     case GDK_T:
-      return VKEY_T; //  (54) T key case 't': case 'T': return 0x54;
+      return VKEY_T;  // (54) T key case 't': case 'T': return 0x54;
     case GDK_u:
     case GDK_U:
-      return VKEY_U; //  (55) U key case 'u': case 'U': return 0x55;
+      return VKEY_U;  // (55) U key case 'u': case 'U': return 0x55;
     case GDK_v:
     case GDK_V:
-      return VKEY_V; //  (56) V key case 'v': case 'V': return 0x56;
+      return VKEY_V;  // (56) V key case 'v': case 'V': return 0x56;
     case GDK_w:
     case GDK_W:
-      return VKEY_W; //  (57) W key case 'w': case 'W': return 0x57;
+      return VKEY_W;  // (57) W key case 'w': case 'W': return 0x57;
     case GDK_x:
     case GDK_X:
-      return VKEY_X; //  (58) X key case 'x': case 'X': return 0x58;
+      return VKEY_X;  // (58) X key case 'x': case 'X': return 0x58;
     case GDK_y:
     case GDK_Y:
-      return VKEY_Y; //  (59) Y key case 'y': case 'Y': return 0x59;
+      return VKEY_Y;  // (59) Y key case 'y': case 'Y': return 0x59;
     case GDK_z:
     case GDK_Z:
-      return VKEY_Z; //  (5A) Z key case 'z': case 'Z': return 0x5A;
+      return VKEY_Z;  // (5A) Z key case 'z': case 'Z': return 0x5A;
     case GDK_Meta_L:
       return VKEY_LWIN; // (5B) Left Windows key (Microsoft Natural keyboard)
     case GDK_Meta_R:
@@ -275,10 +275,10 @@ base::KeyboardCode WindowsKeyCodeForGdkKeyCode(int keycode) {
       // handled by key code above
 
     case GDK_Num_Lock:
-      return VKEY_NUMLOCK; // (90) NUM LOCK key
+      return VKEY_NUMLOCK;  // (90) NUM LOCK key
 
     case GDK_Scroll_Lock:
-      return VKEY_SCROLL; // (91) SCROLL LOCK key
+      return VKEY_SCROLL;  // (91) SCROLL LOCK key
 
       // VKEY_LSHIFT (A0) Left SHIFT key
       // VKEY_RSHIFT (A1) Right SHIFT key
@@ -309,57 +309,57 @@ base::KeyboardCode WindowsKeyCodeForGdkKeyCode(int keycode) {
       // keyboard. Windows 2000/XP: For the US standard keyboard, the ';:' key
     case GDK_semicolon:
     case GDK_colon:
-      return VKEY_OEM_1; //case ';': case ':': return 0xBA;
+      return VKEY_OEM_1;  // case ';': case ':': return 0xBA;
       // VKEY_OEM_PLUS (BB) Windows 2000/XP: For any country/region, the '+' key
     case GDK_plus:
     case GDK_equal:
-      return VKEY_OEM_PLUS; //case '=': case '+': return 0xBB;
+      return VKEY_OEM_PLUS;  // case '=': case '+': return 0xBB;
       // VKEY_OEM_COMMA (BC) Windows 2000/XP: For any country/region, the ','
       // key
     case GDK_comma:
     case GDK_less:
-      return VKEY_OEM_COMMA; //case ',': case '<': return 0xBC;
+      return VKEY_OEM_COMMA;  // case ',': case '<': return 0xBC;
       // VKEY_OEM_MINUS (BD) Windows 2000/XP: For any country/region, the '-'
       // key
     case GDK_minus:
     case GDK_underscore:
-      return VKEY_OEM_MINUS; //case '-': case '_': return 0xBD;
+      return VKEY_OEM_MINUS;  // case '-': case '_': return 0xBD;
       // VKEY_OEM_PERIOD (BE) Windows 2000/XP: For any country/region, the '.'
       // key
     case GDK_period:
     case GDK_greater:
-      return VKEY_OEM_PERIOD; //case '.': case '>': return 0xBE;
+      return VKEY_OEM_PERIOD;  // case '.': case '>': return 0xBE;
       // VKEY_OEM_2 (BF) Used for miscellaneous characters; it can vary by
       // keyboard. Windows 2000/XP: For the US standard keyboard, the '/?' key
     case GDK_slash:
     case GDK_question:
-      return VKEY_OEM_2; //case '/': case '?': return 0xBF;
+      return VKEY_OEM_2;  // case '/': case '?': return 0xBF;
       // VKEY_OEM_3 (C0) Used for miscellaneous characters; it can vary by
       // keyboard. Windows 2000/XP: For the US standard keyboard, the '`~' key
     case GDK_asciitilde:
     case GDK_quoteleft:
-      return VKEY_OEM_3; //case '`': case '~': return 0xC0;
+      return VKEY_OEM_3;  // case '`': case '~': return 0xC0;
       // VKEY_OEM_4 (DB) Used for miscellaneous characters; it can vary by
       // keyboard. Windows 2000/XP: For the US standard keyboard, the '[{' key
     case GDK_bracketleft:
     case GDK_braceleft:
-      return VKEY_OEM_4; //case '[': case '{': return 0xDB;
+      return VKEY_OEM_4;  // case '[': case '{': return 0xDB;
       // VKEY_OEM_5 (DC) Used for miscellaneous characters; it can vary by
       // keyboard. Windows 2000/XP: For the US standard keyboard, the '\|' key
     case GDK_backslash:
     case GDK_bar:
-      return VKEY_OEM_5; //case '\\': case '|': return 0xDC;
+      return VKEY_OEM_5;  // case '\\': case '|': return 0xDC;
       // VKEY_OEM_6 (DD) Used for miscellaneous characters; it can vary by
       // keyboard. Windows 2000/XP: For the US standard keyboard, the ']}' key
     case GDK_bracketright:
     case GDK_braceright:
-      return VKEY_OEM_6; // case ']': case '}': return 0xDD;
+      return VKEY_OEM_6;  // case ']': case '}': return 0xDD;
       // VKEY_OEM_7 (DE) Used for miscellaneous characters; it can vary by
       // keyboard. Windows 2000/XP: For the US standard keyboard, the
       // 'single-quote/double-quote' key
     case GDK_quoteright:
     case GDK_quotedbl:
-      return VKEY_OEM_7; // case '\'': case '"': return 0xDE;
+      return VKEY_OEM_7;  // case '\'': case '"': return 0xDE;
       // VKEY_OEM_8 (DF) Used for miscellaneous characters; it can vary by
       // keyboard.
       // VKEY_OEM_102 (E2) Windows 2000/XP: Either the angle bracket key or the
diff --git a/base/lazy_instance_unittest.cc b/base/lazy_instance_unittest.cc
index cf17a84..d55f664 100644
--- a/base/lazy_instance_unittest.cc
+++ b/base/lazy_instance_unittest.cc
@@ -41,7 +41,9 @@ int SlowConstructor::constructed = 0;
 
 class SlowDelegate : public base::DelegateSimpleThread::Delegate {
  public:
-  SlowDelegate(base::LazyInstance<SlowConstructor>* lazy) : lazy_(lazy) { }
+  explicit SlowDelegate(base::LazyInstance<SlowConstructor>* lazy)
+      : lazy_(lazy) {}
+
   virtual void Run() {
     EXPECT_EQ(12, lazy_->Get().some_int());
     EXPECT_EQ(12, lazy_->Pointer()->some_int());
diff --git a/base/linked_ptr.h b/base/linked_ptr.h
index 3f2bdb9..d9e81b3 100644
--- a/base/linked_ptr.h
+++ b/base/linked_ptr.h
@@ -85,7 +85,11 @@ class linked_ptr {
 
   // Copy an existing linked_ptr<>, adding ourselves to the list of references.
   template <typename U> linked_ptr(linked_ptr<U> const& ptr) { copy(&ptr); }
-  linked_ptr(linked_ptr const& ptr) { DCHECK_NE(&ptr, this); copy(&ptr); }
+
+  linked_ptr(linked_ptr const& ptr) {
+    DCHECK_NE(&ptr, this);
+    copy(&ptr);
+  }
 
   // Assignment releases the old value and acquires the new.
   template <typename U> linked_ptr& operator=(linked_ptr<U> const& ptr) {
@@ -103,7 +107,10 @@ class linked_ptr {
   }
 
   // Smart pointer members.
-  void reset(T* ptr = NULL) { depart(); capture(ptr); }
+  void reset(T* ptr = NULL) {
+    depart();
+    capture(ptr);
+  }
   T* get() const { return value_; }
   T* operator->() const { return value_; }
   T& operator*() const { return *value_; }
diff --git a/base/logging_win.cc b/base/logging_win.cc
index b3702aa..d28ce91 100644
--- a/base/logging_win.cc
+++ b/base/logging_win.cc
@@ -17,7 +17,7 @@ struct LogEventProviderTraits {
     logging::LogEventProvider* ptr =
         reinterpret_cast<logging::LogEventProvider*>(buffer_);
     // We are protected by a memory barrier.
-    new (ptr) logging::LogEventProvider();
+    new(ptr) logging::LogEventProvider();
     return ptr;
   }
 
diff --git a/base/md5.cc b/base/md5.cc
index f2e1c4a..f85cf43 100644
--- a/base/md5.cc
+++ b/base/md5.cc
@@ -33,7 +33,7 @@ struct Context {
 /*
  * Note: this code is harmless on little-endian machines.
  */
-static void byteReverse (unsigned char *buf, unsigned longs){
+static void byteReverse(unsigned char *buf, unsigned longs){
         uint32 t;
         do {
                 t = (uint32)((unsigned)buf[3]<<8 | buf[2]) << 16 |
@@ -175,7 +175,7 @@ void MD5Update(MD5Context *pCtx, const void *inbuf, size_t len){
 
         /* Handle any leading odd-sized chunks */
 
-        if ( t ) {
+        if (t) {
                 unsigned char *p = (unsigned char *)ctx->in + t;
 
                 t = 64-t;
@@ -257,7 +257,7 @@ std::string MD5DigestToBase16(const MD5Digest& digest){
   ret.resize(32);
 
   int j = 0;
-  for(int i = 0; i < 16; i ++){
+  for (int i = 0; i < 16; i ++) {
     int a = digest.a[i];
     ret[j++] = zEncode[(a>>4)&0xf];
     ret[j++] = zEncode[a & 0xf];
diff --git a/base/message_loop.cc b/base/message_loop.cc
index 314a7a0..dbe780a 100644
--- a/base/message_loop.cc
+++ b/base/message_loop.cc
@@ -72,7 +72,7 @@ static LPTOP_LEVEL_EXCEPTION_FILTER GetTopSEHFilter() {
 MessageLoop* MessageLoop::current() {
   // TODO(darin): sadly, we cannot enable this yet since people call us even
   // when they have no intention of using us.
-  //DCHECK(loop) << "Ouch, did you forget to initialize me?";
+  // DCHECK(loop) << "Ouch, did you forget to initialize me?";
   return lazy_tls_ptr.Pointer()->Get();
 }
 
diff --git a/base/message_pump_glib_unittest.cc b/base/message_pump_glib_unittest.cc
index d742055..efe1cb4 100644
--- a/base/message_pump_glib_unittest.cc
+++ b/base/message_pump_glib_unittest.cc
@@ -296,7 +296,7 @@ namespace {
 // while making sure there is always work to do and events in the queue.
 class ConcurrentHelper : public base::RefCounted<ConcurrentHelper>  {
  public:
-  ConcurrentHelper(EventInjector* injector)
+  explicit ConcurrentHelper(EventInjector* injector)
       : injector_(injector),
         event_count_(kStartingEventCount),
         task_count_(kStartingTaskCount) {
diff --git a/base/object_watcher_unittest.cc b/base/object_watcher_unittest.cc
index 7b3a3a6..3605dbb 100644
--- a/base/object_watcher_unittest.cc
+++ b/base/object_watcher_unittest.cc
@@ -19,7 +19,7 @@ class QuitDelegate : public base::ObjectWatcher::Delegate {
 
 class DecrementCountDelegate : public base::ObjectWatcher::Delegate {
  public:
-  DecrementCountDelegate(int* counter) : counter_(counter) {
+  explicit DecrementCountDelegate(int* counter) : counter_(counter) {
   }
   virtual void OnObjectSignaled(HANDLE object) {
     --(*counter_);
diff --git a/base/observer_list_unittest.cc b/base/observer_list_unittest.cc
index ba4b5de..3f5ff0a 100644
--- a/base/observer_list_unittest.cc
+++ b/base/observer_list_unittest.cc
@@ -62,7 +62,7 @@ class ThreadSafeDisrupter : public Foo {
 
 class AddInObserve : public Foo {
  public:
-  AddInObserve(ObserverList<Foo>* observer_list)
+  explicit AddInObserve(ObserverList<Foo>* observer_list)
       : added(false),
         observer_list(observer_list),
         adder(1) {
diff --git a/base/process_util_posix.cc b/base/process_util_posix.cc
index c6759f9..f49ba7e 100644
--- a/base/process_util_posix.cc
+++ b/base/process_util_posix.cc
@@ -471,7 +471,7 @@ ProcessMetrics::ProcessMetrics(ProcessHandle process,
       last_system_time_(0)
 #if defined(OS_LINUX)
       , last_cpu_(0)
-#elif defined (OS_MACOSX)
+#elif defined(OS_MACOSX)
       , port_provider_(port_provider)
 #endif
 {
@@ -544,7 +544,7 @@ bool DidProcessCrash(bool* child_exited, ProcessHandle handle) {
     *child_exited = true;
 
   if (WIFSIGNALED(status)) {
-    switch(WTERMSIG(status)) {
+    switch (WTERMSIG(status)) {
       case SIGSEGV:
       case SIGILL:
       case SIGABRT:
diff --git a/base/process_util_win.cc b/base/process_util_win.cc
index d00e1de..42e727c 100644
--- a/base/process_util_win.cc
+++ b/base/process_util_win.cc
@@ -765,7 +765,7 @@ size_t GetSystemCommitCharge() {
   GetSystemInfo(&system_info);
 
   PERFORMANCE_INFORMATION info;
-  if (! InternalGetPerformanceInfo(&info, sizeof(info))) {
+  if (!InternalGetPerformanceInfo(&info, sizeof(info))) {
     LOG(ERROR) << "Failed to fetch internal performance info.";
     return 0;
   }
diff --git a/base/profiler.cc b/base/profiler.cc
index 75c5cad..cff16a5 100644
--- a/base/profiler.cc
+++ b/base/profiler.cc
@@ -6,7 +6,7 @@
 #include "base/string_util.h"
 
 // When actually using quantify, uncomment the following line.
-//#define QUANTIFY
+// #define QUANTIFY
 
 #ifdef QUANTIFY
 // this #define is used to prevent people from directly using pure.h
diff --git a/base/rand_util.h b/base/rand_util.h
index 18e7469..e6ffe9a 100644
--- a/base/rand_util.h
+++ b/base/rand_util.h
@@ -20,4 +20,4 @@ double RandDouble();
 
 }  // namespace base
 
-#endif // BASE_RAND_UTIL_H_
+#endif  // BASE_RAND_UTIL_H_
diff --git a/base/registry.cc b/base/registry.cc
index e5709f2..bdd3089 100644
--- a/base/registry.cc
+++ b/base/registry.cc
@@ -51,7 +51,7 @@ bool RegistryValueIterator::Valid() const {
   return key_ != NULL && index_ >= 0;
 }
 
-void RegistryValueIterator::operator ++ () {
+void RegistryValueIterator::operator++() {
   // advance to the next entry in the folder
   --index_;
   Read();
@@ -120,7 +120,7 @@ bool RegistryKeyIterator::Valid() const {
   return key_ != NULL && index_ >= 0;
 }
 
-void RegistryKeyIterator::operator ++ () {
+void RegistryKeyIterator::operator++() {
   // advance to the next entry in the folder
   --index_;
   Read();
@@ -163,8 +163,9 @@ RegKey::RegKey(HKEY rootkey, const tchar* subkey, REGSAM access)
       this->Create(rootkey, subkey, access);
     else
       this->Open(rootkey, subkey, access);
+  } else {
+    assert(!subkey);
   }
-  else assert(!subkey);
 }
 
 void RegKey::Close() {
@@ -198,7 +199,8 @@ bool RegKey::CreateWithDisposition(HKEY rootkey, const tchar* subkey,
     key_ = NULL;
     return false;
   }
-  else return true;
+
+  return true;
 }
 
 bool RegKey::Open(HKEY rootkey, const tchar* subkey, REGSAM access) {
@@ -211,7 +213,8 @@ bool RegKey::Open(HKEY rootkey, const tchar* subkey, REGSAM access) {
     key_ = NULL;
     return false;
   }
-  else return true;
+
+  return true;
 }
 
 bool RegKey::CreateKey(const tchar* name, REGSAM access) {
@@ -297,7 +300,8 @@ bool RegKey::ReadValue(const tchar* name, tstr * value) {
     }
     return true;
   }
-  else return false;
+
+  return false;
 }
 
 bool RegKey::ReadValueDW(const tchar* name, DWORD * value) {
@@ -309,7 +313,8 @@ bool RegKey::ReadValueDW(const tchar* name, DWORD * value) {
     *value = result;
     return true;
   }
-  else return false;
+
+  return false;
 }
 
 bool RegKey::WriteValue(const tchar* name,
diff --git a/base/resource_util.h b/base/resource_util.h
index 8f89de5..eb2276f 100644
--- a/base/resource_util.h
+++ b/base/resource_util.h
@@ -21,4 +21,4 @@ bool GetDataResourceFromModule(HMODULE module, int resource_id,
                                void** data, size_t* length);
 }  // namespace
 
-#endif // BASE_RESOURCE_UTIL_H__
+#endif  // BASE_RESOURCE_UTIL_H__
diff --git a/base/scoped_cftyperef.h b/base/scoped_cftyperef.h
index 7b4f1e6..89a07de 100644
--- a/base/scoped_cftyperef.h
+++ b/base/scoped_cftyperef.h
@@ -14,7 +14,7 @@
 // scoped_ptr<>'s interface, with which everyone is already familiar.
 //
 // When scoped_cftyperef<> takes ownership of an object (in the constructor or
-// in reset()), it takes over the caller's existing ownership claim.  The 
+// in reset()), it takes over the caller's existing ownership claim.  The
 // caller must own the object it gives to scoped_cftyperef<>, and relinquishes
 // an ownership claim to that object.  scoped_cftyperef<> does not call
 // CFRetain().
diff --git a/base/scoped_handle.h b/base/scoped_handle.h
index e53b2dd..32a4b3c 100644
--- a/base/scoped_handle.h
+++ b/base/scoped_handle.h
@@ -51,4 +51,4 @@ class ScopedStdioHandle {
   DISALLOW_EVIL_CONSTRUCTORS(ScopedStdioHandle);
 };
 
-#endif // BASE_SCOPED_HANDLE_H_
+#endif  // BASE_SCOPED_HANDLE_H_
diff --git a/base/scoped_handle_win.h b/base/scoped_handle_win.h
index 6375ad9..1e60024 100644
--- a/base/scoped_handle_win.h
+++ b/base/scoped_handle_win.h
@@ -220,4 +220,4 @@ class ScopedHGlobal {
   DISALLOW_EVIL_CONSTRUCTORS(ScopedHGlobal);
 };
 
-#endif // BASE_SCOPED_HANDLE_WIN_H_
+#endif  // BASE_SCOPED_HANDLE_WIN_H_
diff --git a/base/scoped_nsdisable_screen_updates.h b/base/scoped_nsdisable_screen_updates.h
index 3258fca..964f1bc 100644
--- a/base/scoped_nsdisable_screen_updates.h
+++ b/base/scoped_nsdisable_screen_updates.h
@@ -32,4 +32,4 @@ class ScopedNSDisableScreenUpdates {
 
 }  // namespace
 
-#endif
+#endif  // BASE_SCOPED_NSDISABLE_SCREEN_UPDATES_H_
diff --git a/base/scoped_vector.h b/base/scoped_vector.h
index 80a46ca..0c7449d 100644
--- a/base/scoped_vector.h
+++ b/base/scoped_vector.h
@@ -39,7 +39,10 @@ class ScopedVector {
   std::vector<T*>& get() { return v; }
   const std::vector<T*>& get() const { return v; }
   void swap(ScopedVector<T>& other) { v.swap(other.v); }
-  void release(std::vector<T*>* out) { out->swap(v); v.clear(); }
+  void release(std::vector<T*>* out) {
+    out->swap(v);
+    v.clear();
+  }
 
   void reset() { STLDeleteElements(&v); }
 
@@ -49,4 +52,4 @@ class ScopedVector {
   DISALLOW_COPY_AND_ASSIGN(ScopedVector);
 };
 
-#endif // BASE_SCOPED_VECTOR_H_
+#endif  // BASE_SCOPED_VECTOR_H_
diff --git a/base/sha2.h b/base/sha2.h
index d7772e3..5678dbf 100644
--- a/base/sha2.h
+++ b/base/sha2.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 BASE_SHA2_H__
-#define BASE_SHA2_H__
+#ifndef BASE_SHA2_H_
+#define BASE_SHA2_H_
 
 #include <string>
 
@@ -24,4 +24,4 @@ void SHA256HashString(const std::string& str, void* output, size_t len);
 
 }  // namespace base
 
-#endif // BASE_SHA2_H__
+#endif  // BASE_SHA2_H_
diff --git a/base/simple_thread_unittest.cc b/base/simple_thread_unittest.cc
index 639eeae..8bb267d 100644
--- a/base/simple_thread_unittest.cc
+++ b/base/simple_thread_unittest.cc
@@ -27,7 +27,7 @@ class SetIntRunner : public base::DelegateSimpleThread::Delegate {
 
 class WaitEventRunner : public base::DelegateSimpleThread::Delegate {
  public:
-  WaitEventRunner(base::WaitableEvent* event) : event_(event) { }
+  explicit WaitEventRunner(base::WaitableEvent* event) : event_(event) { }
   ~WaitEventRunner() { }
 
   virtual void Run() {
@@ -41,7 +41,7 @@ class WaitEventRunner : public base::DelegateSimpleThread::Delegate {
 
 class SeqRunner : public base::DelegateSimpleThread::Delegate {
  public:
-  SeqRunner(base::AtomicSequenceNumber* seq) : seq_(seq) { }
+  explicit SeqRunner(base::AtomicSequenceNumber* seq) : seq_(seq) { }
   virtual void Run() {
     seq_->GetNext();
   }
diff --git a/base/spin_wait.h b/base/spin_wait.h
index 36ae083..d6571b7 100644
--- a/base/spin_wait.h
+++ b/base/spin_wait.h
@@ -37,7 +37,7 @@
 #define SPIN_FOR_TIMEDELTA_OR_UNTIL_TRUE(delta, expression) do { \
   base::Time start = base::Time::Now(); \
   const base::TimeDelta kTimeout = delta; \
-    while(!(expression)) { \
+    while (!(expression)) { \
       if (kTimeout < base::Time::Now() - start) { \
       EXPECT_LE((base::Time::Now() - start).InMilliseconds(), \
                 kTimeout.InMilliseconds()) << "Timed out"; \
@@ -45,7 +45,6 @@
       } \
       PlatformThread::Sleep(50); \
     } \
-  } \
-  while(0)
+  } while (0)
 
 #endif  // BASE_SPIN_WAIT_H__
diff --git a/base/stack_container_unittest.cc b/base/stack_container_unittest.cc
index dd741bb..e1392c1 100644
--- a/base/stack_container_unittest.cc
+++ b/base/stack_container_unittest.cc
@@ -13,7 +13,7 @@ namespace {
 
 class Dummy : public base::RefCounted<Dummy> {
  public:
-  Dummy(int* alive) : alive_(alive) {
+  explicit Dummy(int* alive) : alive_(alive) {
     ++*alive_;
   }
 
diff --git a/base/stats_table_unittest.cc b/base/stats_table_unittest.cc
index e321f20..a91d70e 100644
--- a/base/stats_table_unittest.cc
+++ b/base/stats_table_unittest.cc
@@ -242,7 +242,7 @@ TEST_F(StatsTableTest, MultipleProcesses) {
 
 class MockStatsCounter : public StatsCounter {
  public:
-  MockStatsCounter(const std::string& name)
+  explicit MockStatsCounter(const std::string& name)
       : StatsCounter(name) {}
   int* Pointer() { return GetPtr(); }
 };
@@ -266,7 +266,7 @@ TEST_F(StatsTableTest, StatsCounter) {
   EXPECT_EQ(0, table.GetCounterValue("c:foo"));
 
   // Test Increment.
-  while(*(foo.Pointer()) < 123) foo.Increment();
+  while (*(foo.Pointer()) < 123) foo.Increment();
   EXPECT_EQ(123, table.GetCounterValue("c:foo"));
   foo.Add(0);
   EXPECT_EQ(123, table.GetCounterValue("c:foo"));
@@ -296,7 +296,7 @@ TEST_F(StatsTableTest, StatsCounter) {
 
 class MockStatsCounterTimer : public StatsCounterTimer {
  public:
-  MockStatsCounterTimer(const std::string& name)
+  explicit MockStatsCounterTimer(const std::string& name)
       : StatsCounterTimer(name) {}
 
   TimeTicks start_time() { return start_time_; }
diff --git a/base/string_piece.h b/base/string_piece.h
index 47d4968..5b4bf40 100644
--- a/base/string_piece.h
+++ b/base/string_piece.h
@@ -55,8 +55,14 @@ class StringPiece {
   size_type length() const { return length_; }
   bool empty() const { return length_ == 0; }
 
-  void clear() { ptr_ = NULL; length_ = 0; }
-  void set(const char* data, size_type len) { ptr_ = data; length_ = len; }
+  void clear() {
+    ptr_ = NULL;
+    length_ = 0;
+  }
+  void set(const char* data, size_type len) {
+    ptr_ = data;
+    length_ = len;
+  }
   void set(const char* str) {
     ptr_ = str;
     length_ = str ? strlen(str) : 0;
diff --git a/base/sync_socket_posix.cc b/base/sync_socket_posix.cc
index 194c0bc..d4a302e 100644
--- a/base/sync_socket_posix.cc
+++ b/base/sync_socket_posix.cc
@@ -63,7 +63,7 @@ bool SyncSocket::CreatePair(SyncSocket* pair[2]) {
   pair[1] = tmp_sockets[1];
   return true;
 
-cleanup:
+ cleanup:
   if (handles[0] != kInvalidHandle)
     (void) close(handles[0]);
   if (handles[1] != kInvalidHandle)
diff --git a/base/sys_string_conversions_unittest.cc b/base/sys_string_conversions_unittest.cc
index 56c5412..dd94258 100644
--- a/base/sys_string_conversions_unittest.cc
+++ b/base/sys_string_conversions_unittest.cc
@@ -78,7 +78,7 @@ namespace {
 
 class ScopedSetLocale {
  public:
-  ScopedSetLocale(const char* locale) {
+  explicit ScopedSetLocale(const char* locale) {
     old_locale_ = setlocale(LC_ALL, NULL);
     setlocale(LC_ALL, locale);
   }
diff --git a/base/test/perf_test_suite.h b/base/test/perf_test_suite.h
index eed3cfc..896659b 100644
--- a/base/test/perf_test_suite.h
+++ b/base/test/perf_test_suite.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 BASE_PERF_TEST_SUITE_H_
-#define BASE_PERF_TEST_SUITE_H_
+#ifndef BASE_TEST_PERF_TEST_SUITE_H_
+#define BASE_TEST_PERF_TEST_SUITE_H_
 
 #include "base/command_line.h"
 #include "base/debug_util.h"
@@ -48,4 +48,4 @@ class PerfTestSuite : public TestSuite {
   }
 };
 
-#endif  // BASE_PERF_TEST_SUITE_H_
+#endif  // BASE_TEST_PERF_TEST_SUITE_H_
diff --git a/base/test/test_file_util.h b/base/test/test_file_util.h
index e9e888e..fc1c4d5 100644
--- a/base/test/test_file_util.h
+++ b/base/test/test_file_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 BASE_TEST_FILE_UTIL_H_
-#define BASE_TEST_FILE_UTIL_H_
+#ifndef BASE_TEST_TEST_FILE_UTIL_H_
+#define BASE_TEST_TEST_FILE_UTIL_H_
 
 // File utility functions used only by tests.
 
@@ -33,4 +33,4 @@ bool CopyRecursiveDirNoCache(const FilePath& source_dir,
 
 }  // namespace file_util
 
-#endif  // BASE_TEST_FILE_UTIL_H_
+#endif  // BASE_TEST_TEST_FILE_UTIL_H_
diff --git a/base/test/test_suite.h b/base/test/test_suite.h
index c738518..2c491c2 100644
--- a/base/test/test_suite.h
+++ b/base/test/test_suite.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 BASE_TEST_SUITE_H_
-#define BASE_TEST_SUITE_H_
+#ifndef BASE_TEST_TEST_SUITE_H_
+#define BASE_TEST_TEST_SUITE_H_
 
 // Defines a basic test suite framework for running gtest based tests.  You can
 // instantiate this class in your main function and call its Run method to run
@@ -229,4 +229,4 @@ class TestSuite {
   base::AtExitManager at_exit_manager_;
 };
 
-#endif  // BASE_TEST_SUITE_H_
+#endif  // BASE_TEST_TEST_SUITE_H_
diff --git a/base/thread_local_storage.h b/base/thread_local_storage.h
index 646ded5..6e693a0 100644
--- a/base/thread_local_storage.h
+++ b/base/thread_local_storage.h
@@ -24,7 +24,7 @@ class ThreadLocalStorage {
   // A key representing one value stored in TLS.
   class Slot {
    public:
-    Slot(TLSDestructorFunc destructor = NULL);
+    explicit Slot(TLSDestructorFunc destructor = NULL);
 
     // This constructor should be used for statics.
     // It returns an uninitialized Slot.
diff --git a/base/time_win.cc b/base/time_win.cc
index eedf468..58fe6ae 100644
--- a/base/time_win.cc
+++ b/base/time_win.cc
@@ -113,7 +113,7 @@ Time Time::Now() {
   //
   // To avoid any drift, we periodically resync the counters to the system
   // clock.
-  while(true) {
+  while (true) {
     TimeTicks ticks = TimeTicks::Now();
 
     // Calculate the time elapsed since we started our timer
diff --git a/base/timer.h b/base/timer.h
index a87149e..a6d18bc 100644
--- a/base/timer.h
+++ b/base/timer.h
@@ -85,7 +85,7 @@ class BaseTimer_Helper {
   // We have access to the timer_ member so we can orphan this task.
   class TimerTask : public Task {
    public:
-    TimerTask(TimeDelta delay) : timer_(NULL), delay_(delay) {
+    explicit TimerTask(TimeDelta delay) : timer_(NULL), delay_(delay) {
     }
     virtual ~TimerTask() {}
     BaseTimer_Helper* timer_;
diff --git a/base/timer_unittest.cc b/base/timer_unittest.cc
index 8c18947..9a77b02 100644
--- a/base/timer_unittest.cc
+++ b/base/timer_unittest.cc
@@ -34,7 +34,7 @@ class OneShotTimerTester {
 
 class OneShotSelfDeletingTimerTester {
  public:
-  OneShotSelfDeletingTimerTester(bool* did_run) :
+  explicit OneShotSelfDeletingTimerTester(bool* did_run) :
       did_run_(did_run),
       timer_(new base::OneShotTimer<OneShotSelfDeletingTimerTester>()) {
   }
@@ -54,8 +54,10 @@ class OneShotSelfDeletingTimerTester {
 
 class RepeatingTimerTester {
  public:
-  RepeatingTimerTester(bool* did_run) : did_run_(did_run), counter_(10) {
+  explicit RepeatingTimerTester(bool* did_run)
+      : did_run_(did_run), counter_(10) {
   }
+
   void Start() {
     timer_.Start(TimeDelta::FromMilliseconds(10), this,
                  &RepeatingTimerTester::Run);
diff --git a/base/trace_event.h b/base/trace_event.h
index a42c4d4..46b8a37 100644
--- a/base/trace_event.h
+++ b/base/trace_event.h
@@ -130,4 +130,4 @@ class TraceLog {
 
 } // namespace base
 
-#endif // BASE_TRACE_EVENT_H_
+#endif  // BASE_TRACE_EVENT_H_
diff --git a/base/tuple.h b/base/tuple.h
index 23ef9de..b3a7515 100644
--- a/base/tuple.h
+++ b/base/tuple.h
@@ -171,7 +171,7 @@ struct Tuple4 {
 
 template <class A, class B, class C, class D, class E>
 struct Tuple5 {
-public:
+ public:
   typedef A TypeA;
   typedef B TypeB;
   typedef C TypeC;
@@ -211,7 +211,7 @@ public:
 
 template <class A, class B, class C, class D, class E, class F>
 struct Tuple6 {
-public:
+ public:
   typedef A TypeA;
   typedef B TypeB;
   typedef C TypeC;
@@ -257,7 +257,7 @@ public:
 
 template <class A, class B, class C, class D, class E, class F, class G>
 struct Tuple7 {
-public:
+ public:
   typedef A TypeA;
   typedef B TypeB;
   typedef C TypeC;
@@ -609,9 +609,8 @@ inline void DispatchToMethod(ObjT* obj, Method method,
   (obj->*method)(in.a, in.b, in.c, in.d, &out->a);
 }
 
-template<class ObjT, class Method,
-         class InA, class InB, class InC, class InD, class InE,
-         class OutA>
+template<class ObjT, class Method, class InA, class InB, class InC, class InD,
+         class InE, class OutA>
 inline void DispatchToMethod(ObjT* obj, Method method,
                              const Tuple5<InA, InB, InC, InD, InE>& in,
                              Tuple1<OutA>* out) {
diff --git a/base/values.h b/base/values.h
index 83e840d..e000508 100644
--- a/base/values.h
+++ b/base/values.h
@@ -315,7 +315,10 @@ class DictionaryValue : public Value {
     : private std::iterator<std::input_iterator_tag, const std::wstring> {
    public:
     explicit key_iterator(ValueMap::const_iterator itr) { itr_ = itr; }
-    key_iterator operator++() { ++itr_; return *this; }
+    key_iterator operator++() {
+      ++itr_;
+      return *this;
+    }
     const std::wstring& operator*() { return itr_->first; }
     bool operator!=(const key_iterator& other) { return itr_ != other.itr_; }
     bool operator==(const key_iterator& other) { return itr_ == other.itr_; }
diff --git a/base/values_unittest.cc b/base/values_unittest.cc
index a20f3c8..a0ab47f 100644
--- a/base/values_unittest.cc
+++ b/base/values_unittest.cc
@@ -169,7 +169,7 @@ TEST(ValuesTest, StringValue) {
 // properly deleted by modifying the value of external flag on destruction.
 class DeletionTestValue : public Value {
  public:
-  DeletionTestValue(bool* deletion_flag) : Value(TYPE_NULL) {
+  explicit DeletionTestValue(bool* deletion_flag) : Value(TYPE_NULL) {
     Init(deletion_flag);  // Separate function so that we can use ASSERT_*
   }
 
diff --git a/base/version.h b/base/version.h
index 45329fc..b2ad7f5 100644
--- a/base/version.h
+++ b/base/version.h
@@ -11,7 +11,7 @@
 #include "base/basictypes.h"
 
 class Version {
-public:
+ public:
   // The version string must be made up of 1 or more uint16's separated
   // by '.'. Returns NULL if string is not in this format.
   // Caller is responsible for freeing the Version object once done.
@@ -30,7 +30,7 @@ public:
 
   const std::vector<uint16>& components() const { return components_; }
 
-private:
+ private:
   Version() {}
   bool InitFromString(const std::string& version_str);
 
diff --git a/base/waitable_event_watcher_unittest.cc b/base/waitable_event_watcher_unittest.cc
index c1d930a..86acee0 100644
--- a/base/waitable_event_watcher_unittest.cc
+++ b/base/waitable_event_watcher_unittest.cc
@@ -22,7 +22,7 @@ class QuitDelegate : public WaitableEventWatcher::Delegate {
 
 class DecrementCountDelegate : public WaitableEventWatcher::Delegate {
  public:
-  DecrementCountDelegate(int* counter) : counter_(counter) {
+  explicit DecrementCountDelegate(int* counter) : counter_(counter) {
   }
   virtual void OnWaitableEventSignaled(WaitableEvent* object) {
     --(*counter_);
diff --git a/base/worker_pool_unittest.cc b/base/worker_pool_unittest.cc
index e07e8ab..f6bee96 100644
--- a/base/worker_pool_unittest.cc
+++ b/base/worker_pool_unittest.cc
@@ -16,7 +16,7 @@ namespace {
 
 class PostTaskTestTask : public Task {
  public:
-  PostTaskTestTask(WaitableEvent* event) : event_(event) {
+  explicit PostTaskTestTask(WaitableEvent* event) : event_(event) {
   }
 
   void Run() {