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
author: erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> 2009-11-13 19:56:17 +0000
committer: erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> 2009-11-13 19:56:17 +0000
commit: 11f48572859aca238afeb436d2504c5ffab49f07 (patch)
tree: 1b31af349eb99a9e83716f5add3273b42bee41cf
parent: af530ac147feb1b04446f529daa4cc4448f89b23 (diff)
download: chromium_src-11f48572859aca238afeb436d2504c5ffab49f07.zip
chromium_src-11f48572859aca238afeb436d2504c5ffab49f07.tar.gz
chromium_src-11f48572859aca238afeb436d2504c5ffab49f07.tar.bz2
287 files changed, 676 insertions, 690 deletions
diff --git a/chrome/app/breakpad_win.h b/chrome/app/breakpad_win.h
index 3aeb5ea..c7cd9ec 100644
--- a/chrome/app/breakpad_win.h
+++ b/chrome/app/breakpad_win.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_APP_BREAKPAD_H_
-#define CHROME_APP_BREAKPAD_H_
+#ifndef CHROME_APP_BREAKPAD_WIN_H_
+#define CHROME_APP_BREAKPAD_WIN_H_
 
 #include <windows.h>
 #include <string>
@@ -20,4 +20,4 @@ void InitDefaultCrashCallback();
 // a dialog asking for permission to continue execution or to exit now.
 bool ShowRestartDialogIfCrashed(bool* exit_now);
 
-#endif  // CHROME_APP_BREAKPAD_H_
+#endif  // CHROME_APP_BREAKPAD_WIN_H_
diff --git a/chrome/browser/app_modal_dialog.h b/chrome/browser/app_modal_dialog.h
index e071871..a58981c 100644
--- a/chrome/browser/app_modal_dialog.h
+++ b/chrome/browser/app_modal_dialog.h
@@ -122,4 +122,4 @@ class AppModalDialog : public NotificationObserver {
   IPC::Message* reply_msg_;
 };
 
-#endif  // #ifndef CHROME_BROWSER_APP_MODAL_DIALOG_H_
+#endif  // CHROME_BROWSER_APP_MODAL_DIALOG_H_
diff --git a/chrome/browser/app_modal_dialog_queue.h b/chrome/browser/app_modal_dialog_queue.h
index 8053342..aa169c5 100644
--- a/chrome/browser/app_modal_dialog_queue.h
+++ b/chrome/browser/app_modal_dialog_queue.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_APP_MODAL_DIALOG_QUEUE_H__
-#define CHROME_BROWSER_APP_MODAL_DIALOG_QUEUE_H__
+#ifndef CHROME_BROWSER_APP_MODAL_DIALOG_QUEUE_H_
+#define CHROME_BROWSER_APP_MODAL_DIALOG_QUEUE_H_
 
 #include <queue>
 
@@ -70,4 +70,4 @@ class AppModalDialogQueue {
   DISALLOW_COPY_AND_ASSIGN(AppModalDialogQueue);
 };
 
-#endif // CHROME_BROWSER_APP_MODAL_DIALOG_QUEUE_H__
+#endif  // CHROME_BROWSER_APP_MODAL_DIALOG_QUEUE_H_
diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_win.cc b/chrome/browser/autocomplete/autocomplete_edit_view_win.cc
index a03c1e4..134cbea4 100644
--- a/chrome/browser/autocomplete/autocomplete_edit_view_win.cc
+++ b/chrome/browser/autocomplete/autocomplete_edit_view_win.cc
@@ -949,7 +949,9 @@ bool AutocompleteEditViewWin::IsCommandIdEnabled(int command_id) const {
     case IDS_SELECT_ALL:   return !!CanSelectAll();
     case IDS_EDIT_SEARCH_ENGINES:
       return command_updater_->IsCommandEnabled(IDC_EDIT_SEARCH_ENGINES);
-    default:               NOTREACHED(); return false;
+    default:
+      NOTREACHED();
+      return false;
   }
 }
 
diff --git a/chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc b/chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc
index 06e7c1a..b22944b 100644
--- a/chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc
+++ b/chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc
@@ -498,7 +498,7 @@ gboolean AutocompletePopupViewGtk::HandleExpose(GtkWidget* widget,
     actual_content_width /= PANGO_SCALE;
     actual_content_height /= PANGO_SCALE;
 
-    //DCHECK_LT(actual_content_height, kHeightPerResult);  // Font is too tall.
+    // DCHECK_LT(actual_content_height, kHeightPerResult);  // Font is too tall.
     // Center the text within the line.
     int content_y = std::max(line_rect.y(),
         line_rect.y() + ((kHeightPerResult - actual_content_height) / 2));
diff --git a/chrome/browser/autofill/autofill_field.h b/chrome/browser/autofill/autofill_field.h
index 670fd14..e8672d0 100644
--- a/chrome/browser/autofill/autofill_field.h
+++ b/chrome/browser/autofill/autofill_field.h
@@ -10,7 +10,7 @@
 
 class AutoFillField : public webkit_glue::FormField {
  public:
-  AutoFillField(const webkit_glue::FormField& field);
+  explicit AutoFillField(const webkit_glue::FormField& field);
 
   const FieldTypeSet& possible_types() const { return possible_types_; }
 
diff --git a/chrome/browser/automation/automation_autocomplete_edit_tracker.h b/chrome/browser/automation/automation_autocomplete_edit_tracker.h
index 4911ff7..3f741f3 100644
--- a/chrome/browser/automation/automation_autocomplete_edit_tracker.h
+++ b/chrome/browser/automation/automation_autocomplete_edit_tracker.h
@@ -10,8 +10,8 @@
 #include "chrome/common/notification_source.h"
 #include "chrome/common/notification_type.h"
 
-class AutomationAutocompleteEditTracker :
-    public AutomationResourceTracker<AutocompleteEditView*> {
+class AutomationAutocompleteEditTracker
+    : public AutomationResourceTracker<AutocompleteEditView*> {
  public:
   explicit AutomationAutocompleteEditTracker(IPC::Message::Sender* automation)
       : AutomationResourceTracker<AutocompleteEditView*>(automation) { }
diff --git a/chrome/browser/automation/automation_browser_tracker.h b/chrome/browser/automation/automation_browser_tracker.h
index e57e0e8..6d4aa9b 100644
--- a/chrome/browser/automation/automation_browser_tracker.h
+++ b/chrome/browser/automation/automation_browser_tracker.h
@@ -10,8 +10,8 @@
 
 // Tracks Browser objects.
 class AutomationBrowserTracker : public AutomationResourceTracker<Browser*> {
-public:
-  AutomationBrowserTracker(IPC::Message::Sender* automation)
+ public:
+  explicit AutomationBrowserTracker(IPC::Message::Sender* automation)
       : AutomationResourceTracker<Browser*>(automation) { }
 
   virtual ~AutomationBrowserTracker() {
diff --git a/chrome/browser/automation/automation_provider_list.h b/chrome/browser/automation/automation_provider_list.h
index bedb6a6..4e4ca86 100644
--- a/chrome/browser/automation/automation_provider_list.h
+++ b/chrome/browser/automation/automation_provider_list.h
@@ -35,7 +35,7 @@ class AutomationProviderList {
 
   static AutomationProviderList* GetInstance();
 
-private:
+ private:
   AutomationProviderList();
   void OnLastProviderRemoved();
   list_type automation_providers_;
diff --git a/chrome/browser/automation/automation_resource_message_filter.h b/chrome/browser/automation/automation_resource_message_filter.h
index 7bb03d6..4625534 100644
--- a/chrome/browser/automation/automation_resource_message_filter.h
+++ b/chrome/browser/automation/automation_resource_message_filter.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_AUTOMATION_AUTOMATION_RESOURCE_MSG_FILTER_H_
-#define CHROME_BROWSER_AUTOMATION_AUTOMATION_RESOURCE_MSG_FILTER_H_
+#ifndef CHROME_BROWSER_AUTOMATION_AUTOMATION_RESOURCE_MESSAGE_FILTER_H_
+#define CHROME_BROWSER_AUTOMATION_AUTOMATION_RESOURCE_MESSAGE_FILTER_H_
 
 #include <map>
 
@@ -121,5 +121,5 @@ class AutomationResourceMessageFilter
   DISALLOW_COPY_AND_ASSIGN(AutomationResourceMessageFilter);
 };
 
-#endif  // CHROME_BROWSER_AUTOMATION_AUTOMATION_RESOURCE_MSG_FILTER_H_
+#endif  // CHROME_BROWSER_AUTOMATION_AUTOMATION_RESOURCE_MESSAGE_FILTER_H_
 
diff --git a/chrome/browser/automation/automation_resource_tracker.h b/chrome/browser/automation/automation_resource_tracker.h
index 9d3d137..8500aea 100644
--- a/chrome/browser/automation/automation_resource_tracker.h
+++ b/chrome/browser/automation/automation_resource_tracker.h
@@ -30,8 +30,8 @@ struct AutomationResourceTraits<T*> {
 // This class exists for the sole purpose of allowing some of the implementation
 // of AutomationResourceTracker to live in a .cc file.
 class AutomationResourceTrackerImpl {
-public:
-  AutomationResourceTrackerImpl(IPC::Message::Sender* sender)
+ public:
+  explicit AutomationResourceTrackerImpl(IPC::Message::Sender* sender)
     : sender_(sender) {}
 
   virtual ~AutomationResourceTrackerImpl() {}
@@ -51,13 +51,13 @@ public:
   int GetHandleImpl(void* resource);
   void HandleCloseNotification(void* resource);
 
-protected:
+ protected:
   typedef std::map<void*, int> ResourceToHandleMap;
   typedef std::map<int, void*> HandleToResourceMap;
   ResourceToHandleMap resource_to_handle_;
   HandleToResourceMap handle_to_resource_;
 
-private:
+ private:
   DISALLOW_EVIL_CONSTRUCTORS(AutomationResourceTrackerImpl);
 
   IPC::Message::Sender* sender_;
@@ -72,7 +72,7 @@ template <class T>
 class AutomationResourceTracker : public NotificationObserver,
                                   private AutomationResourceTrackerImpl {
  public:
-  AutomationResourceTracker(IPC::Message::Sender* automation)
+  explicit AutomationResourceTracker(IPC::Message::Sender* automation)
     : AutomationResourceTrackerImpl(automation) {}
 
   virtual ~AutomationResourceTracker() {
@@ -125,7 +125,7 @@ class AutomationResourceTracker : public NotificationObserver,
   // that the associated handle is now invalid.
   virtual void Observe(NotificationType type,
                        const NotificationSource& source,
-                       const NotificationDetails& details){
+                       const NotificationDetails& details) {
      T resource =
         Source<typename AutomationResourceTraits<T>::ValueType>(source).ptr();
 
diff --git a/chrome/browser/automation/automation_tab_tracker.h b/chrome/browser/automation/automation_tab_tracker.h
index 8137721..36c2bb9d 100644
--- a/chrome/browser/automation/automation_tab_tracker.h
+++ b/chrome/browser/automation/automation_tab_tracker.h
@@ -15,8 +15,8 @@
 
 class AutomationTabTracker
   : public AutomationResourceTracker<NavigationController*> {
-public:
-  AutomationTabTracker(IPC::Message::Sender* automation)
+ public:
+  explicit AutomationTabTracker(IPC::Message::Sender* automation)
       : AutomationResourceTracker<NavigationController*>(automation) {}
 
   virtual ~AutomationTabTracker() {
diff --git a/chrome/browser/automation/automation_window_tracker.h b/chrome/browser/automation/automation_window_tracker.h
index 0823634..c69673e 100644
--- a/chrome/browser/automation/automation_window_tracker.h
+++ b/chrome/browser/automation/automation_window_tracker.h
@@ -13,7 +13,7 @@
 class AutomationWindowTracker
     : public AutomationResourceTracker<gfx::NativeWindow> {
  public:
-  AutomationWindowTracker(IPC::Message::Sender* automation)
+  explicit AutomationWindowTracker(IPC::Message::Sender* automation)
       : AutomationResourceTracker<gfx::NativeWindow>(automation) { }
   virtual ~AutomationWindowTracker() {
   }
diff --git a/chrome/browser/automation/url_request_automation_job.h b/chrome/browser/automation/url_request_automation_job.h
index 5865fb3..824b80c 100644
--- a/chrome/browser/automation/url_request_automation_job.h
+++ b/chrome/browser/automation/url_request_automation_job.h
@@ -3,8 +3,8 @@
 // found in the LICENSE file.
 // This class simulates what wininet does when a dns lookup fails.
 
-#ifndef CHROME_BROWSER_AUTOMATION_AUTOMATION_URL_REQUEST_JOB_H_
-#define CHROME_BROWSER_AUTOMATION_AUTOMATION_URL_REQUEST_JOB_H_
+#ifndef CHROME_BROWSER_AUTOMATION_URL_REQUEST_AUTOMATION_JOB_H_
+#define CHROME_BROWSER_AUTOMATION_URL_REQUEST_AUTOMATION_JOB_H_
 
 #include "chrome/common/ref_counted_util.h"
 #include "net/http/http_response_headers.h"
@@ -92,5 +92,5 @@ class URLRequestAutomationJob : public URLRequestJob {
   DISALLOW_COPY_AND_ASSIGN(URLRequestAutomationJob);
 };
 
-#endif  // CHROME_BROWSER_AUTOMATION_AUTOMATION_URL_REQUEST_JOB_H_
+#endif  // CHROME_BROWSER_AUTOMATION_URL_REQUEST_AUTOMATION_JOB_H_
 
diff --git a/chrome/browser/bookmarks/bookmark_folder_tree_model.h b/chrome/browser/bookmarks/bookmark_folder_tree_model.h
index 6f1d713..9d7480c 100644
--- a/chrome/browser/bookmarks/bookmark_folder_tree_model.h
+++ b/chrome/browser/bookmarks/bookmark_folder_tree_model.h
@@ -77,7 +77,7 @@ class BookmarkFolderTreeModel : public TreeNodeModel<FolderNode>,
   virtual void GetIcons(std::vector<SkBitmap>* icons);
   virtual int GetIconIndex(TreeModelNode* node);
 
-private:
+ private:
   // Invoked from the constructor to create the children of the root node.
   void AddRootChildren();
 
diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc
index 0ecdcb4..7b728e3 100644
--- a/chrome/browser/browser.cc
+++ b/chrome/browser/browser.cc
@@ -1401,7 +1401,8 @@ void Browser::ExecuteCommandWithDisposition(
     case IDC_NEW_WINDOW_PROFILE_6:
     case IDC_NEW_WINDOW_PROFILE_7:
     case IDC_NEW_WINDOW_PROFILE_8:
-        NewProfileWindowByIndex(id - IDC_NEW_WINDOW_PROFILE_0);    break;
+        NewProfileWindowByIndex(id - IDC_NEW_WINDOW_PROFILE_0);
+        break;
     case IDC_CLOSE_WINDOW:          CloseWindow();                 break;
     case IDC_NEW_TAB:               NewTab();                      break;
     case IDC_CLOSE_TAB:             CloseTab();                    break;
@@ -2428,37 +2429,35 @@ void Browser::InitCommandState() {
 #endif
 
   // Initialize other commands based on the window type.
-  {
-    bool normal_window = type() == TYPE_NORMAL;
+  bool normal_window = type() == TYPE_NORMAL;
 
-    // Navigation commands
-    command_updater_.UpdateCommandEnabled(IDC_HOME, normal_window);
-
-    // Window management commands
-    command_updater_.UpdateCommandEnabled(IDC_SELECT_NEXT_TAB, normal_window);
-    command_updater_.UpdateCommandEnabled(IDC_SELECT_PREVIOUS_TAB,
-                                          normal_window);
-    command_updater_.UpdateCommandEnabled(IDC_MOVE_TAB_NEXT, normal_window);
-    command_updater_.UpdateCommandEnabled(IDC_MOVE_TAB_PREVIOUS, normal_window);
-    command_updater_.UpdateCommandEnabled(IDC_SELECT_TAB_0, normal_window);
-    command_updater_.UpdateCommandEnabled(IDC_SELECT_TAB_1, normal_window);
-    command_updater_.UpdateCommandEnabled(IDC_SELECT_TAB_2, normal_window);
-    command_updater_.UpdateCommandEnabled(IDC_SELECT_TAB_3, normal_window);
-    command_updater_.UpdateCommandEnabled(IDC_SELECT_TAB_4, normal_window);
-    command_updater_.UpdateCommandEnabled(IDC_SELECT_TAB_5, normal_window);
-    command_updater_.UpdateCommandEnabled(IDC_SELECT_TAB_6, normal_window);
-    command_updater_.UpdateCommandEnabled(IDC_SELECT_TAB_7, normal_window);
-    command_updater_.UpdateCommandEnabled(IDC_SELECT_LAST_TAB, normal_window);
-    command_updater_.UpdateCommandEnabled(IDC_RESTORE_TAB,
-                                          !profile_->IsOffTheRecord());
+  // Navigation commands
+  command_updater_.UpdateCommandEnabled(IDC_HOME, normal_window);
 
-    // Page-related commands
-    command_updater_.UpdateCommandEnabled(IDC_BOOKMARK_PAGE, normal_window);
+  // Window management commands
+  command_updater_.UpdateCommandEnabled(IDC_SELECT_NEXT_TAB, normal_window);
+  command_updater_.UpdateCommandEnabled(IDC_SELECT_PREVIOUS_TAB,
+                                        normal_window);
+  command_updater_.UpdateCommandEnabled(IDC_MOVE_TAB_NEXT, normal_window);
+  command_updater_.UpdateCommandEnabled(IDC_MOVE_TAB_PREVIOUS, normal_window);
+  command_updater_.UpdateCommandEnabled(IDC_SELECT_TAB_0, normal_window);
+  command_updater_.UpdateCommandEnabled(IDC_SELECT_TAB_1, normal_window);
+  command_updater_.UpdateCommandEnabled(IDC_SELECT_TAB_2, normal_window);
+  command_updater_.UpdateCommandEnabled(IDC_SELECT_TAB_3, normal_window);
+  command_updater_.UpdateCommandEnabled(IDC_SELECT_TAB_4, normal_window);
+  command_updater_.UpdateCommandEnabled(IDC_SELECT_TAB_5, normal_window);
+  command_updater_.UpdateCommandEnabled(IDC_SELECT_TAB_6, normal_window);
+  command_updater_.UpdateCommandEnabled(IDC_SELECT_TAB_7, normal_window);
+  command_updater_.UpdateCommandEnabled(IDC_SELECT_LAST_TAB, normal_window);
+  command_updater_.UpdateCommandEnabled(IDC_RESTORE_TAB,
+                                        !profile_->IsOffTheRecord());
 
-    // Show various bits of UI
-    command_updater_.UpdateCommandEnabled(IDC_CLEAR_BROWSING_DATA,
-                                          normal_window);
-  }
+  // Page-related commands
+  command_updater_.UpdateCommandEnabled(IDC_BOOKMARK_PAGE, normal_window);
+
+  // Show various bits of UI
+  command_updater_.UpdateCommandEnabled(IDC_CLEAR_BROWSING_DATA,
+                                        normal_window);
 
   // Initialize other commands whose state changes based on fullscreen mode.
   UpdateCommandsForFullscreenMode(false);
diff --git a/chrome/browser/browser_init.h b/chrome/browser/browser_init.h
index 9d8be57..9ac3a99 100644
--- a/chrome/browser/browser_init.h
+++ b/chrome/browser/browser_init.h
@@ -22,8 +22,8 @@ class TabContents;
 // initialize the profile.
 class BrowserInit {
  public:
-  BrowserInit() {};
-  ~BrowserInit() {};
+  BrowserInit() {}
+  ~BrowserInit() {}
 
   // Adds a url to be opened during first run. This overrides the standard
   // tabs shown at first run.
diff --git a/chrome/browser/browser_list.h b/chrome/browser/browser_list.h
index bc136aa..a1e1d5d 100644
--- a/chrome/browser/browser_list.h
+++ b/chrome/browser/browser_list.h
@@ -28,7 +28,7 @@ class BrowserList {
     virtual void OnBrowserRemoving(const Browser* browser) = 0;
 
     // Called immediately after a browser is set active (SetLastActive)
-    virtual void OnBrowserSetLastActive(const Browser* browser) { };
+    virtual void OnBrowserSetLastActive(const Browser* browser) { }
   };
 
   // Adds and removes browsers from the global list. The browser object should
diff --git a/chrome/browser/browsing_instance.h b/chrome/browser/browsing_instance.h
index 9310b6a..fe0ea69 100644
--- a/chrome/browser/browsing_instance.h
+++ b/chrome/browser/browsing_instance.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_BROWSING_INSTANCE_H__
-#define CHROME_BROWSER_BROWSING_INSTANCE_H__
+#ifndef CHROME_BROWSER_BROWSING_INSTANCE_H_
+#define CHROME_BROWSER_BROWSING_INSTANCE_H_
 
 #include "base/hash_tables.h"
 #include "base/logging.h"
@@ -55,7 +55,7 @@ class SiteInstance;
 class BrowsingInstance : public base::RefCounted<BrowsingInstance> {
  public:
   // Create a new BrowsingInstance.
-  BrowsingInstance(Profile* profile)
+  explicit BrowsingInstance(Profile* profile)
       : profile_(profile) {
   }
 
@@ -133,4 +133,4 @@ class BrowsingInstance : public base::RefCounted<BrowsingInstance> {
   DISALLOW_EVIL_CONSTRUCTORS(BrowsingInstance);
 };
 
-#endif  //  CHROME_BROWSER_BROWSING_INSTANCE_H__
+#endif  // CHROME_BROWSER_BROWSING_INSTANCE_H_
diff --git a/chrome/browser/cancelable_request.h b/chrome/browser/cancelable_request.h
index d081c4d..e83dd0c 100644
--- a/chrome/browser/cancelable_request.h
+++ b/chrome/browser/cancelable_request.h
@@ -342,8 +342,8 @@ typedef CancelableRequestConsumerT<int, 0> CancelableRequestConsumer;
 // other thread for the callback, but will still be destroyed properly.
 
 // Non-templatized base class that provides cancellation
-class CancelableRequestBase :
-    public base::RefCountedThreadSafe<CancelableRequestBase> {
+class CancelableRequestBase
+    : public base::RefCountedThreadSafe<CancelableRequestBase> {
  public:
   friend class CancelableRequestProvider;
 
diff --git a/chrome/browser/chrome_thread.h b/chrome/browser/chrome_thread.h
index fd791bd..e72e8b4 100644
--- a/chrome/browser/chrome_thread.h
+++ b/chrome/browser/chrome_thread.h
@@ -181,4 +181,4 @@ class ChromeThread : public base::Thread {
   static ChromeThread* chrome_threads_[ID_COUNT];
 };
 
-#endif  // #ifndef CHROME_BROWSER_CHROME_THREAD_H_
+#endif  // CHROME_BROWSER_CHROME_THREAD_H_
diff --git a/chrome/browser/chromeos/panels/panel_scroller_header.h b/chrome/browser/chromeos/panels/panel_scroller_header.h
index e4aa8d9..701acb5 100644
--- a/chrome/browser/chromeos/panels/panel_scroller_header.h
+++ b/chrome/browser/chromeos/panels/panel_scroller_header.h
@@ -15,7 +15,7 @@ class PanelScroller;
 
 class PanelScrollerHeader : public views::View {
  public:
-  PanelScrollerHeader(PanelScroller* scroller);
+  explicit PanelScrollerHeader(PanelScroller* scroller);
   virtual ~PanelScrollerHeader();
 
   void set_title(const string16& title) {
diff --git a/chrome/browser/command_updater.h b/chrome/browser/command_updater.h
index 3a6b7ca..ebe271e 100644
--- a/chrome/browser/command_updater.h
+++ b/chrome/browser/command_updater.h
@@ -88,4 +88,4 @@ class CommandUpdater {
   DISALLOW_EVIL_CONSTRUCTORS(CommandUpdater);
 };
 
-#endif // CHROME_BROWSER_COMMAND_UPDATER_H_
+#endif  // CHROME_BROWSER_COMMAND_UPDATER_H_
diff --git a/chrome/browser/debugger/debugger_host.h b/chrome/browser/debugger/debugger_host.h
index 1adf56d..71857e5 100644
--- a/chrome/browser/debugger/debugger_host.h
+++ b/chrome/browser/debugger/debugger_host.h
@@ -16,8 +16,8 @@ class ListValue;
 
 class DebuggerHost : public base::RefCountedThreadSafe<DebuggerHost> {
  public:
-  DebuggerHost() {};
-  virtual ~DebuggerHost() {};
+  DebuggerHost() {}
+  virtual ~DebuggerHost() {}
 
   // call before other methods
   virtual void Start() = 0;
@@ -45,4 +45,4 @@ class DebuggerHost : public base::RefCountedThreadSafe<DebuggerHost> {
   DISALLOW_COPY_AND_ASSIGN(DebuggerHost);
 };
 
-#endif // CHROME_BROWSER_DEBUGGER_DEBUGGER_HOST_H_
+#endif  // CHROME_BROWSER_DEBUGGER_DEBUGGER_HOST_H_
diff --git a/chrome/browser/debugger/devtools_manager.h b/chrome/browser/debugger/devtools_manager.h
index 1c61794..6264a3a 100644
--- a/chrome/browser/debugger/devtools_manager.h
+++ b/chrome/browser/debugger/devtools_manager.h
@@ -78,7 +78,7 @@ class DevToolsManager : public DevToolsClientHost::CloseListener,
   void AttachClientHost(int client_host_cookie,
                         RenderViewHost* to_rvh);
 
-private:
+ private:
   friend class base::RefCounted<DevToolsManager>;
 
   virtual ~DevToolsManager();
diff --git a/chrome/browser/debugger/devtools_window.h b/chrome/browser/debugger/devtools_window.h
index 3398bfb..f583327 100644
--- a/chrome/browser/debugger/devtools_window.h
+++ b/chrome/browser/debugger/devtools_window.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_DEBUGGER_DEV_TOOLS_WINDOW_H_
-#define CHROME_BROWSER_DEBUGGER_DEV_TOOLS_WINDOW_H_
+#ifndef CHROME_BROWSER_DEBUGGER_DEVTOOLS_WINDOW_H_
+#define CHROME_BROWSER_DEBUGGER_DEVTOOLS_WINDOW_H_
 
 #include <string>
 
@@ -24,10 +24,10 @@ class Profile;
 class RenderViewHost;
 class TabContents;
 
-class DevToolsWindow :
-    public DevToolsClientHost,
-    public NotificationObserver,
-    TabContentsDelegate {
+class DevToolsWindow
+    : public DevToolsClientHost,
+      public NotificationObserver,
+      public TabContentsDelegate {
  public:
   static TabContents* GetDevToolsContents(TabContents* inspected_tab);
 
@@ -46,7 +46,7 @@ class DevToolsWindow :
 
   TabContents* tab_contents() { return tab_contents_; }
   Browser* browser() { return browser_; } //  For tests.
-  bool is_docked() { return docked_; };
+  bool is_docked() { return docked_; }
 
  private:
   void CreateDevToolsBrowser();
@@ -93,4 +93,4 @@ class DevToolsWindow :
   DISALLOW_COPY_AND_ASSIGN(DevToolsWindow);
 };
 
-#endif  // CHROME_BROWSER_DEBUGGER_DEV_TOOLS_WINDOW_H_
+#endif  // CHROME_BROWSER_DEBUGGER_DEVTOOLS_WINDOW_H_
diff --git a/chrome/browser/dom_ui/filebrowse_ui.cc b/chrome/browser/dom_ui/filebrowse_ui.cc
index 06ff2af..8f957f5 100644
--- a/chrome/browser/dom_ui/filebrowse_ui.cc
+++ b/chrome/browser/dom_ui/filebrowse_ui.cc
@@ -110,7 +110,7 @@ FileBrowseUIHTMLSource::FileBrowseUIHTMLSource()
 void FileBrowseUIHTMLSource::StartDataRequest(const std::string& path,
                                               int request_id) {
   DictionaryValue localized_strings;
-  //TODO(dhg): Add stirings to localized strings, also add more strings
+  // TODO(dhg): Add stirings to localized strings, also add more strings
   // that are currently hardcoded.
   localized_strings.SetString(L"devices", "devices");
 
diff --git a/chrome/browser/download/download_file.h b/chrome/browser/download/download_file.h
index 0705ffe..8b58f99 100644
--- a/chrome/browser/download/download_file.h
+++ b/chrome/browser/download/download_file.h
@@ -86,7 +86,7 @@ struct DownloadBuffer {
 // cancelled, the DownloadFile is destroyed.
 class DownloadFile {
  public:
-  DownloadFile(const DownloadCreateInfo* info);
+  explicit DownloadFile(const DownloadCreateInfo* info);
   ~DownloadFile();
 
   bool Initialize();
@@ -167,7 +167,7 @@ class DownloadFile {
 class DownloadFileManager
     : public base::RefCountedThreadSafe<DownloadFileManager> {
  public:
-  DownloadFileManager(ResourceDispatcherHost* rdh);
+  explicit DownloadFileManager(ResourceDispatcherHost* rdh);
 
   // Called on shutdown on the UI thread.
   void Shutdown();
diff --git a/chrome/browser/download/download_item_model.h b/chrome/browser/download/download_item_model.h
index 7b25cc2..82d70ec 100644
--- a/chrome/browser/download/download_item_model.h
+++ b/chrome/browser/download/download_item_model.h
@@ -16,7 +16,8 @@ class SavePackage;
 // depending on the type of download.
 class BaseDownloadItemModel {
  public:
-  BaseDownloadItemModel(DownloadItem* download) : download_(download) { }
+  explicit BaseDownloadItemModel(DownloadItem* download)
+      : download_(download) { }
   virtual ~BaseDownloadItemModel() { }
 
   // Cancel the task corresponding to the item.
@@ -36,7 +37,7 @@ class BaseDownloadItemModel {
 // status.
 class DownloadItemModel : public BaseDownloadItemModel {
  public:
-  DownloadItemModel(DownloadItem* download);
+  explicit DownloadItemModel(DownloadItem* download);
   virtual ~DownloadItemModel() { }
 
   // Cancel the downloading.
diff --git a/chrome/browser/download/download_manager.h b/chrome/browser/download/download_manager.h
index 30423ba..042c427 100644
--- a/chrome/browser/download/download_manager.h
+++ b/chrome/browser/download/download_manager.h
@@ -100,7 +100,7 @@ class DownloadItem {
   };
 
   // Constructing from persistent store:
-  DownloadItem(const DownloadCreateInfo& info);
+  explicit DownloadItem(const DownloadCreateInfo& info);
 
   // Constructing from user action:
   DownloadItem(int32 download_id,
diff --git a/chrome/browser/download/download_request_manager.h b/chrome/browser/download/download_request_manager.h
index c8d4a34..270f539 100644
--- a/chrome/browser/download/download_request_manager.h
+++ b/chrome/browser/download/download_request_manager.h
@@ -40,8 +40,8 @@ class TabContents;
 //   the user allowed the download, multiple downloads are allowed without any
 //   user intervention until the user navigates to a different host.
 
-class DownloadRequestManager :
-    public base::RefCountedThreadSafe<DownloadRequestManager> {
+class DownloadRequestManager
+    : public base::RefCountedThreadSafe<DownloadRequestManager> {
  public:
   // Download status for a particular page. See class description for details.
   enum DownloadStatus {
diff --git a/chrome/browser/download/download_started_animation.h b/chrome/browser/download/download_started_animation.h
index 92f18a1..9ae1f713 100644
--- a/chrome/browser/download/download_started_animation.h
+++ b/chrome/browser/download/download_started_animation.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_DOWNLOAD_STARTED_ANIMATION_FACTORY_H_
-#define CHROME_BROWSER_DOWNLOAD_STARTED_ANIMATION_FACTORY_H_
+#ifndef CHROME_BROWSER_DOWNLOAD_DOWNLOAD_STARTED_ANIMATION_H_
+#define CHROME_BROWSER_DOWNLOAD_DOWNLOAD_STARTED_ANIMATION_H_
 
 class TabContents;
 
@@ -15,4 +15,4 @@ class DownloadStartedAnimation {
   DownloadStartedAnimation() { }
 };
 
-#endif  // CHROME_BROWSER_DOWNLOAD_STARTED_ANIMATION_FACTORY_H_
+#endif  // CHROME_BROWSER_DOWNLOAD_DOWNLOAD_STARTED_ANIMATION_H_
diff --git a/chrome/browser/download/download_util.h b/chrome/browser/download/download_util.h
index 5238a97..a88c538 100644
--- a/chrome/browser/download/download_util.h
+++ b/chrome/browser/download/download_util.h
@@ -35,7 +35,7 @@ namespace download_util {
 template<class DownloadView>
 class DownloadProgressTask : public Task {
  public:
-  DownloadProgressTask(DownloadView* view) : view_(view) {}
+  explicit DownloadProgressTask(DownloadView* view) : view_(view) {}
   virtual ~DownloadProgressTask() {}
   virtual void Run() {
     view_->UpdateDownloadProgress();
diff --git a/chrome/browser/download/save_file_manager.h b/chrome/browser/download/save_file_manager.h
index ba470d1..24684ff 100644
--- a/chrome/browser/download/save_file_manager.h
+++ b/chrome/browser/download/save_file_manager.h
@@ -79,7 +79,7 @@ class URLRequestContextGetter;
 class SaveFileManager
     : public base::RefCountedThreadSafe<SaveFileManager> {
  public:
-  SaveFileManager(ResourceDispatcherHost* rdh);
+  explicit SaveFileManager(ResourceDispatcherHost* rdh);
 
   // Lifetime management.
   void Shutdown();
diff --git a/chrome/browser/extensions/crx_installer.h b/chrome/browser/extensions/crx_installer.h
index 21de58d..48a7d58 100644
--- a/chrome/browser/extensions/crx_installer.h
+++ b/chrome/browser/extensions/crx_installer.h
@@ -34,9 +34,9 @@ class SkBitmap;
 // long enough to receive the result of unpacking.
 //
 // TODO(aa): Pull out a frontend interface for testing?
-class CrxInstaller :
-    public SandboxedExtensionUnpackerClient,
-    public ExtensionInstallUI::Delegate {
+class CrxInstaller
+    : public SandboxedExtensionUnpackerClient,
+      public ExtensionInstallUI::Delegate {
  public:
   // Starts the installation of the crx file in |source_file| into
   // |install_directory|.
diff --git a/chrome/browser/extensions/extension_function_dispatcher.h b/chrome/browser/extensions/extension_function_dispatcher.h
index 16a9fb3..d9c0ea5 100644
--- a/chrome/browser/extensions/extension_function_dispatcher.h
+++ b/chrome/browser/extensions/extension_function_dispatcher.h
@@ -39,7 +39,8 @@ class ExtensionFunctionDispatcher {
   // destroyed.
   // TODO: this should use WeakPtr
   struct Peer : public base::RefCounted<Peer> {
-    Peer(ExtensionFunctionDispatcher* dispatcher) : dispatcher_(dispatcher) {}
+    explicit Peer(ExtensionFunctionDispatcher* dispatcher)
+        : dispatcher_(dispatcher) {}
     ExtensionFunctionDispatcher* dispatcher_;
 
   private:
diff --git a/chrome/browser/extensions/extension_shelf_model.h b/chrome/browser/extensions/extension_shelf_model.h
index 29f6592..bffdbdf 100644
--- a/chrome/browser/extensions/extension_shelf_model.h
+++ b/chrome/browser/extensions/extension_shelf_model.h
@@ -24,7 +24,7 @@ class ExtensionShelfModelObserver;
 // are specific to a Browser.
 class ExtensionShelfModel : public NotificationObserver {
  public:
-  ExtensionShelfModel(Browser* browser);
+  explicit ExtensionShelfModel(Browser* browser);
   virtual ~ExtensionShelfModel();
 
   struct ToolstripItem {
diff --git a/chrome/browser/extensions/extensions_service.h b/chrome/browser/extensions/extensions_service.h
index 2393891..1a8c336 100644
--- a/chrome/browser/extensions/extensions_service.h
+++ b/chrome/browser/extensions/extensions_service.h
@@ -309,7 +309,7 @@ class ExtensionsServiceBackend
   // |rdh| can be NULL in the case of test environment.
   // |extension_prefs| contains a dictionary value that points to the extension
   // preferences.
-  ExtensionsServiceBackend(const FilePath& install_directory);
+  explicit ExtensionsServiceBackend(const FilePath& install_directory);
 
   // Loads a single extension from |path| where |path| is the top directory of
   // a specific extension where its manifest file lives.
diff --git a/chrome/browser/extensions/gtk_theme_installed_infobar_delegate.h b/chrome/browser/extensions/gtk_theme_installed_infobar_delegate.h
index 2d72403..abb66b5 100644
--- a/chrome/browser/extensions/gtk_theme_installed_infobar_delegate.h
+++ b/chrome/browser/extensions/gtk_theme_installed_infobar_delegate.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_VIEWS_EXTENSIONS_GTK_THEME_INSTALLED_INFOBAR_DELEGATE_H_
-#define CHROME_BROWSER_VIEWS_EXTENSIONS_GTK_THEME_INSTALLED_INFOBAR_DELEGATE_H_
+#ifndef CHROME_BROWSER_EXTENSIONS_GTK_THEME_INSTALLED_INFOBAR_DELEGATE_H_
+#define CHROME_BROWSER_EXTENSIONS_GTK_THEME_INSTALLED_INFOBAR_DELEGATE_H_
 
 #include "chrome/browser/extensions/theme_installed_infobar_delegate.h"
 
@@ -27,4 +27,4 @@ class GtkThemeInstalledInfoBarDelegate : public ThemeInstalledInfoBarDelegate {
   bool previous_use_gtk_theme_;
 };
 
-#endif  // CHROME_BROWSER_VIEWS_EXTENSIONS_GTK_THEME_INSTALLED_INFOBAR_DELEGATE_H_
+#endif  // CHROME_BROWSER_EXTENSIONS_GTK_THEME_INSTALLED_INFOBAR_DELEGATE_H_
diff --git a/chrome/browser/extensions/pack_extension_job.h b/chrome/browser/extensions/pack_extension_job.h
index 526d16d..8c008d9 100644
--- a/chrome/browser/extensions/pack_extension_job.h
+++ b/chrome/browser/extensions/pack_extension_job.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_EXTENSIONS_PACK_EXTENSION_JOB_UI_H_
-#define CHROME_BROWSER_EXTENSIONS_PACK_EXTENSION_JOB_UI_H_
+#ifndef CHROME_BROWSER_EXTENSIONS_PACK_EXTENSION_JOB_H_
+#define CHROME_BROWSER_EXTENSIONS_PACK_EXTENSION_JOB_H_
 
 #include <string>
 
@@ -52,5 +52,4 @@ class PackExtensionJob : public base::RefCountedThreadSafe<PackExtensionJob> {
   DISALLOW_COPY_AND_ASSIGN(PackExtensionJob);
 };
 
-#endif  // CHROME_BROWSER_EXTENSIONS_PACK_EXTENSION_JOB_UI_H_
-
+#endif  // CHROME_BROWSER_EXTENSIONS_PACK_EXTENSION_JOB_H_
diff --git a/chrome/browser/extensions/theme_installed_infobar_delegate.h b/chrome/browser/extensions/theme_installed_infobar_delegate.h
index 90c25a5..daa11e6 100644
--- a/chrome/browser/extensions/theme_installed_infobar_delegate.h
+++ b/chrome/browser/extensions/theme_installed_infobar_delegate.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_VIEWS_EXTENSIONS_THEME_INSTALLED_INFOBAR_DELEGATE_H_
-#define CHROME_BROWSER_VIEWS_EXTENSIONS_THEME_INSTALLED_INFOBAR_DELEGATE_H_
+#ifndef CHROME_BROWSER_EXTENSIONS_THEME_INSTALLED_INFOBAR_DELEGATE_H_
+#define CHROME_BROWSER_EXTENSIONS_THEME_INSTALLED_INFOBAR_DELEGATE_H_
 
 #include "chrome/browser/tab_contents/infobar_delegate.h"
 
@@ -43,4 +43,4 @@ class ThemeInstalledInfoBarDelegate : public ConfirmInfoBarDelegate {
   std::string previous_theme_id_;
 };
 
-#endif  // CHROME_BROWSER_VIEWS_EXTENSIONS_THEME_INSTALLED_INFOBAR_DELEGATE_H_
+#endif  // CHROME_BROWSER_EXTENSIONS_THEME_INSTALLED_INFOBAR_DELEGATE_H_
diff --git a/chrome/browser/extensions/user_script_listener.h b/chrome/browser/extensions/user_script_listener.h
index 7c22b53..105af4d 100644
--- a/chrome/browser/extensions/user_script_listener.h
+++ b/chrome/browser/extensions/user_script_listener.h
@@ -26,7 +26,7 @@ class UserScriptListener
     : public base::RefCountedThreadSafe<UserScriptListener>,
       public NotificationObserver {
  public:
-  UserScriptListener(ResourceDispatcherHost* rdh);
+  explicit UserScriptListener(ResourceDispatcherHost* rdh);
 
   void OnResourceDispatcherHostGone() { resource_dispatcher_host_ = NULL; }
 
diff --git a/chrome/browser/extensions/user_script_master.h b/chrome/browser/extensions/user_script_master.h
index a8c3fa6..ff1e589 100644
--- a/chrome/browser/extensions/user_script_master.h
+++ b/chrome/browser/extensions/user_script_master.h
@@ -28,7 +28,7 @@ class UserScriptMaster : public base::RefCountedThreadSafe<UserScriptMaster>,
  public:
   // For testability, the constructor takes the path the scripts live in.
   // This is normally a directory inside the profile.
-  UserScriptMaster(const FilePath& script_dir);
+  explicit UserScriptMaster(const FilePath& script_dir);
 
   // Add a watched directory. All scripts will be reloaded when any file in
   // this directory changes.
diff --git a/chrome/browser/first_run.h b/chrome/browser/first_run.h
index b179ce4..6b8a9d39 100644
--- a/chrome/browser/first_run.h
+++ b/chrome/browser/first_run.h
@@ -140,7 +140,7 @@ class Upgrade {
 // so we don't fetch as we have no IO thread (see bug #1292702).
 class FirstRunBrowserProcess : public BrowserProcessImpl {
  public:
-  FirstRunBrowserProcess(const CommandLine& command_line)
+  explicit FirstRunBrowserProcess(const CommandLine& command_line)
       : BrowserProcessImpl(command_line) {
   }
   virtual ~FirstRunBrowserProcess() { }
diff --git a/chrome/browser/history/expire_history_backend.h b/chrome/browser/history/expire_history_backend.h
index dc37044..149bcce 100644
--- a/chrome/browser/history/expire_history_backend.h
+++ b/chrome/browser/history/expire_history_backend.h
@@ -96,7 +96,7 @@ class ExpireHistoryBackend {
   }
 
  private:
-  //friend class ExpireHistoryTest_DeleteFaviconsIfPossible_Test;
+  // friend class ExpireHistoryTest_DeleteFaviconsIfPossible_Test;
   FRIEND_TEST(ExpireHistoryTest, DeleteTextIndexForURL);
   FRIEND_TEST(ExpireHistoryTest, DeleteFaviconsIfPossible);
   FRIEND_TEST(ExpireHistoryTest, ArchiveSomeOldHistory);
diff --git a/chrome/browser/history/history_database.h b/chrome/browser/history/history_database.h
index 560b699..3bb8520 100644
--- a/chrome/browser/history/history_database.h
+++ b/chrome/browser/history/history_database.h
@@ -41,7 +41,7 @@ class HistoryDatabase : public DownloadDatabase,
   // support rollback since the history database doesn't, either.
   class TransactionScoper {
    public:
-    TransactionScoper(HistoryDatabase* db) : db_(db) {
+    explicit TransactionScoper(HistoryDatabase* db) : db_(db) {
       db_->BeginTransaction();
     }
     ~TransactionScoper() {
diff --git a/chrome/browser/history/history_marshaling.h b/chrome/browser/history/history_marshaling.h
index d6decb3..71d7364 100644
--- a/chrome/browser/history/history_marshaling.h
+++ b/chrome/browser/history/history_marshaling.h
@@ -37,7 +37,7 @@ class HistoryAddPageArgs
         referrer(arg_referrer),
         redirects(arg_redirects),
         transition(arg_transition),
-        did_replace_entry(arg_did_replace_entry){
+        did_replace_entry(arg_did_replace_entry) {
   }
 
   GURL url;
diff --git a/chrome/browser/history/history_notifications.h b/chrome/browser/history/history_notifications.h
index 5af5eb2..80fc9d5 100644
--- a/chrome/browser/history/history_notifications.h
+++ b/chrome/browser/history/history_notifications.h
@@ -54,7 +54,7 @@ struct URLsDeletedDetails : public HistoryDetails {
 
 // Details for NOTIFY_URLS_STARRED.
 struct URLsStarredDetails : public HistoryDetails {
-  URLsStarredDetails(bool being_starred) : starred(being_starred) {}
+  explicit URLsStarredDetails(bool being_starred) : starred(being_starred) {}
 
   // The new starred state of the list of URLs. True when they are being
   // starred, false when they are being unstarred.
diff --git a/chrome/browser/history/in_memory_database.h b/chrome/browser/history/in_memory_database.h
index 9f28cf2..62460dd 100644
--- a/chrome/browser/history/in_memory_database.h
+++ b/chrome/browser/history/in_memory_database.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_HISTORY_HISTORY_MEMORY_DB_H_
-#define CHROME_BROWSER_HISTORY_HISTORY_MEMORY_DB_H_
+#ifndef CHROME_BROWSER_HISTORY_IN_MEMORY_DATABASE_H_
+#define CHROME_BROWSER_HISTORY_IN_MEMORY_DATABASE_H_
 
 #include <string>
 
@@ -48,4 +48,4 @@ class InMemoryDatabase : public URLDatabase {
 
 }  // namespace history
 
-#endif  // CHROME_BROWSER_HISTORY_HISTORY_MEMORY_DB_H_
+#endif  // CHROME_BROWSER_HISTORY_IN_MEMORY_DATABASE_H_
diff --git a/chrome/browser/history/in_memory_history_backend.h b/chrome/browser/history/in_memory_history_backend.h
index b421c5f..fe109d5 100644
--- a/chrome/browser/history/in_memory_history_backend.h
+++ b/chrome/browser/history/in_memory_history_backend.h
@@ -77,4 +77,4 @@ class InMemoryHistoryBackend : public NotificationObserver {
 
 }  // namespace history
 
-#endif  // CHROME_BROWSER_IN_MEMORY_HISTORY_BACKEND_H_
+#endif  // CHROME_BROWSER_HISTORY_IN_MEMORY_HISTORY_BACKEND_H_
diff --git a/chrome/browser/history/page_usage_data.h b/chrome/browser/history/page_usage_data.h
index 9e45317..66a63e2 100644
--- a/chrome/browser/history/page_usage_data.h
+++ b/chrome/browser/history/page_usage_data.h
@@ -23,7 +23,7 @@ class SkBitmap;
 /////////////////////////////////////////////////////////////////////////////
 class PageUsageData {
  public:
-  PageUsageData(history::URLID id)
+  explicit PageUsageData(history::URLID id)
       : id_(id),
         thumbnail_(NULL),
         thumbnail_set_(false),
diff --git a/chrome/browser/history/thumbnail_database.cc b/chrome/browser/history/thumbnail_database.cc
index 8ce38da..60b8985 100644
--- a/chrome/browser/history/thumbnail_database.cc
+++ b/chrome/browser/history/thumbnail_database.cc
@@ -111,29 +111,6 @@ InitStatus ThumbnailDatabase::Init(const FilePath& db_name,
     return INIT_FAILURE;
   }
 
-  // The following code is useful in debugging the thumbnail database. Upon
-  // startup, it will spit out a file for each thumbnail in the database so you
-  // can open them in an external viewer. Insert the path name on your system
-  // into the string below (I recommend using a blank directory since there may
-  // be a lot of files).
-#if 0
-  sql::Statement statement(db_.GetUniqueStatement(
-      "SELECT id, image_data FROM favicons"));
-  while (statement.Step()) {
-    int idx = statement.ColumnInt(0);
-    std::vector<unsigned char> data;
-    statement.ColumnBlobAsVector(1, &data);
-
-    char filename[256];
-    sprintf(filename, "<<< YOUR PATH HERE >>>\\%d.png", idx);
-    if (!data.empty()) {
-      file_util::WriteFile(ASCIIToWide(std::string(filename)),
-                           reinterpret_cast<char*>(&data[0]),
-                           data.size());
-    }
-  }
-#endif
-
   return INIT_OK;
 }
 
diff --git a/chrome/browser/history/top_sites.h b/chrome/browser/history/top_sites.h
index 4294578..cce4606 100644
--- a/chrome/browser/history/top_sites.h
+++ b/chrome/browser/history/top_sites.h
@@ -51,8 +51,8 @@ class TopSites : public base::RefCountedThreadSafe<TopSites> {
                         const SkBitmap& thumbnail,
                         const ThumbnailScore& score);
 
-  //TODO(brettw) write this.
-  //bool GetPageThumbnail(const GURL& url, RefCountedBytes** data) const;
+  // TODO(brettw): write this.
+  // bool GetPageThumbnail(const GURL& url, RefCountedBytes** data) const;
 
  private:
   friend class TopSitesTest;
@@ -61,8 +61,8 @@ class TopSites : public base::RefCountedThreadSafe<TopSites> {
     scoped_refptr<RefCountedBytes> thumbnail;
     ThumbnailScore thumbnail_score;
 
-    // TODO(brettw) this will eventually store the favicon.
-    //scoped_refptr<RefCountedBytes> favicon;
+    // TODO(brettw): this will eventually store the favicon.
+    // scoped_refptr<RefCountedBytes> favicon;
   };
 
   // Saves the set of the top URLs visited by this user. The 0th item is the
@@ -118,8 +118,8 @@ class TopSites : public base::RefCountedThreadSafe<TopSites> {
   // maps the redirects to the index into top_sites_ that contains it.
   std::map<GURL, size_t> canonical_urls_;
 
-  // TODO(brettw) use the blacklist.
-  //std::set<GURL> blacklist_;
+  // TODO(brettw): use the blacklist.
+  // std::set<GURL> blacklist_;
 
   DISALLOW_COPY_AND_ASSIGN(TopSites);
 };
diff --git a/chrome/browser/icon_manager.h b/chrome/browser/icon_manager.h
index 1bb8fdf..c09b94e 100644
--- a/chrome/browser/icon_manager.h
+++ b/chrome/browser/icon_manager.h
@@ -119,4 +119,4 @@ class IconManager : public IconLoader::Delegate,
   DISALLOW_COPY_AND_ASSIGN(IconManager);
 };
 
-#endif  // #ifndef CHROME_BROWSER_ICON_MANAGER_H_
+#endif  // CHROME_BROWSER_ICON_MANAGER_H_
diff --git a/chrome/browser/ime_input.h b/chrome/browser/ime_input.h
index b26c277..1d2919b 100644
--- a/chrome/browser/ime_input.h
+++ b/chrome/browser/ime_input.h
@@ -303,4 +303,4 @@ class ImeInput {
   DISALLOW_EVIL_CONSTRUCTORS(ImeInput);
 };
 
-#endif  // #ifndef CHROME_BROWSER_IME_INPUT_H_
+#endif  // CHROME_BROWSER_IME_INPUT_H_
diff --git a/chrome/browser/importer/nss_decryptor_linux.h b/chrome/browser/importer/nss_decryptor_linux.h
index 05684fd..918a063 100644
--- a/chrome/browser/importer/nss_decryptor_linux.h
+++ b/chrome/browser/importer/nss_decryptor_linux.h
@@ -41,10 +41,10 @@ class NSSDecryptor {
   // The result will be stored in |forms|.
   bool ReadAndParseSignons(const FilePath& sqlite_file,
                            std::vector<webkit_glue::PasswordForm>* forms);
-private:
+ private:
   // Does not actually free the slot, since we'll free it when NSSDecryptor is
   // destroyed.
-  void FreeSlot(PK11SlotInfo* slot) const {};
+  void FreeSlot(PK11SlotInfo* slot) const {}
   PK11SlotInfo* GetKeySlotForDB() const { return db_slot_; }
 
   SECStatus PK11SDR_DecryptWithSlot(
diff --git a/chrome/browser/in_process_webkit/browser_webkitclient_impl.h b/chrome/browser/in_process_webkit/browser_webkitclient_impl.h
index 1065269..dd4b401 100644
--- a/chrome/browser/in_process_webkit/browser_webkitclient_impl.h
+++ b/chrome/browser/in_process_webkit/browser_webkitclient_impl.h
@@ -2,8 +2,8 @@
 // source code is governed by a BSD-style license that can be found in the
 // LICENSE file.
 
-#ifndef CHROME_BROWSER_IN_PROCESS_WEBKIT_WEBKIT_CLIENT_IMPL_H_
-#define CHROME_BROWSER_IN_PROCESS_WEBKIT_WEBKIT_CLIENT_IMPL_H_
+#ifndef CHROME_BROWSER_IN_PROCESS_WEBKIT_BROWSER_WEBKITCLIENT_IMPL_H_
+#define CHROME_BROWSER_IN_PROCESS_WEBKIT_BROWSER_WEBKITCLIENT_IMPL_H_
 
 #include "webkit/glue/webkitclient_impl.h"
 
@@ -40,4 +40,4 @@ class BrowserWebKitClientImpl : public webkit_glue::WebKitClientImpl {
   virtual WebKit::WebSharedWorkerRepository* sharedWorkerRepository();
 };
 
-#endif  // CHROME_BROWSER_IN_PROCESS_WEBKIT_WEBKIT_CLIENT_IMPL_H_
+#endif  // CHROME_BROWSER_IN_PROCESS_WEBKIT_BROWSER_WEBKITCLIENT_IMPL_H_
diff --git a/chrome/browser/in_process_webkit/dom_storage_dispatcher_host.h b/chrome/browser/in_process_webkit/dom_storage_dispatcher_host.h
index 45b0eba..b99ac94 100644
--- a/chrome/browser/in_process_webkit/dom_storage_dispatcher_host.h
+++ b/chrome/browser/in_process_webkit/dom_storage_dispatcher_host.h
@@ -22,8 +22,8 @@ struct ViewMsg_DOMStorageEvent_Params;
 // This class handles the logistics of DOM Storage within the browser process.
 // It mostly ferries information between IPCs and the WebKit implementations,
 // but it also handles some special cases like when renderer processes die.
-class DOMStorageDispatcherHost :
-    public base::RefCountedThreadSafe<DOMStorageDispatcherHost> {
+class DOMStorageDispatcherHost
+    : public base::RefCountedThreadSafe<DOMStorageDispatcherHost> {
  public:
   // Only call the constructor from the UI thread.
   DOMStorageDispatcherHost(IPC::Message::Sender* message_sender,
diff --git a/chrome/browser/input_window_dialog.h b/chrome/browser/input_window_dialog.h
index 707c108..c95869e 100644
--- a/chrome/browser/input_window_dialog.h
+++ b/chrome/browser/input_window_dialog.h
@@ -48,4 +48,4 @@ class InputWindowDialog {
   DISALLOW_COPY_AND_ASSIGN(InputWindowDialog);
 };
 
-#endif // CHROME_BROWSER_INPUT_WINDOW_DIALOG_H_
+#endif  // CHROME_BROWSER_INPUT_WINDOW_DIALOG_H_
diff --git a/chrome/browser/jsmessage_box_client.h b/chrome/browser/jsmessage_box_client.h
index 5e60c5d..a370445 100644
--- a/chrome/browser/jsmessage_box_client.h
+++ b/chrome/browser/jsmessage_box_client.h
@@ -47,4 +47,4 @@ class JavaScriptMessageBoxClient {
   virtual TabContents* AsTabContents() = 0;
 };
 
-# endif  // CHROME_BROWSER_JSMESSAGE_BOX_CLIENT_H_
+#endif  // CHROME_BROWSER_JSMESSAGE_BOX_CLIENT_H_
diff --git a/chrome/browser/jsmessage_box_handler.h b/chrome/browser/jsmessage_box_handler.h
index 9ec6652..313b579 100644
--- a/chrome/browser/jsmessage_box_handler.h
+++ b/chrome/browser/jsmessage_box_handler.h
@@ -35,4 +35,4 @@ void RunBeforeUnloadDialog(TabContents* tab_contents,
                            const std::wstring& message_text,
                            IPC::Message* reply_msg);
 
-#endif // CHROME_BROWSER_JSMESSAGE_BOX_HANDLER_H_
+#endif  // CHROME_BROWSER_JSMESSAGE_BOX_HANDLER_H_
diff --git a/chrome/browser/language_combobox_model.h b/chrome/browser/language_combobox_model.h
index 297d32a..98f74a0 100644
--- a/chrome/browser/language_combobox_model.h
+++ b/chrome/browser/language_combobox_model.h
@@ -71,4 +71,4 @@ class LanguageComboboxModel : public ComboboxModel {
   DISALLOW_COPY_AND_ASSIGN(LanguageComboboxModel);
 };
 
-#endif  // #ifndef CHROME_BROWSER_LANGUAGE_COMBOBOX_MODEL_H_
+#endif  // CHROME_BROWSER_LANGUAGE_COMBOBOX_MODEL_H_
diff --git a/chrome/browser/load_from_memory_cache_details.h b/chrome/browser/load_from_memory_cache_details.h
index 27dc4ee..0e8e793b 100644
--- a/chrome/browser/load_from_memory_cache_details.h
+++ b/chrome/browser/load_from_memory_cache_details.h
@@ -34,7 +34,7 @@ class LoadFromMemoryCacheDetails {
   int ssl_cert_id() const { return cert_id_; }
   int ssl_cert_status() const { return cert_status_; }
 
-private:
+ private:
   GURL url_;
   std::string frame_origin_;
   std::string main_frame_origin_;
diff --git a/chrome/browser/login_prompt.h b/chrome/browser/login_prompt.h
index da67c07..9cfa264 100644
--- a/chrome/browser/login_prompt.h
+++ b/chrome/browser/login_prompt.h
@@ -69,7 +69,8 @@ class LoginHandler {
 // for testing.
 class LoginNotificationDetails {
  public:
-  LoginNotificationDetails(LoginHandler* handler) : handler_(handler) {}
+  explicit LoginNotificationDetails(LoginHandler* handler)
+      : handler_(handler) {}
   LoginHandler* handler() const { return handler_; }
 
  private:
diff --git a/chrome/browser/memory_purger.h b/chrome/browser/memory_purger.h
index 1403add..12cb821 100644
--- a/chrome/browser/memory_purger.h
+++ b/chrome/browser/memory_purger.h
@@ -17,7 +17,7 @@ template<typename Type>
 struct DefaultSingletonTraits;
 
 class MemoryPurger : public base::SystemMonitor::PowerObserver {
-public:
+ public:
   static MemoryPurger* GetSingleton();
 
   // PowerObserver
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_
diff --git a/chrome/browser/net/chrome_url_request_context.h b/chrome/browser/net/chrome_url_request_context.h
index 916e765..88b4428 100644
--- a/chrome/browser/net/chrome_url_request_context.h
+++ b/chrome/browser/net/chrome_url_request_context.h
@@ -190,7 +190,7 @@ class ChromeURLRequestContext : public URLRequestContext {
   // Copies the dependencies from |other| into |this|. If you use this
   // constructor, then you should hold a reference to |other|, as we
   // depend on |other| being alive.
-  ChromeURLRequestContext(ChromeURLRequestContext* other);
+  explicit ChromeURLRequestContext(ChromeURLRequestContext* other);
   virtual ~ChromeURLRequestContext();
 
  public:
@@ -286,7 +286,7 @@ class ChromeURLRequestContextFactory {
  public:
   // Extract properties of interested from |profile|, for setting later into
   // a ChromeURLRequestContext using ApplyProfileParametersToContext().
-  ChromeURLRequestContextFactory(Profile* profile);
+  explicit ChromeURLRequestContextFactory(Profile* profile);
 
   virtual ~ChromeURLRequestContextFactory();
 
diff --git a/chrome/browser/net/resolve_proxy_msg_helper.h b/chrome/browser/net/resolve_proxy_msg_helper.h
index 2bc03ec..22be9ed 100644
--- a/chrome/browser/net/resolve_proxy_msg_helper.h
+++ b/chrome/browser/net/resolve_proxy_msg_helper.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_NET_RESOLVE_PROXY_MSG_HELPER_
-#define CHROME_BROWSER_NET_RESOLVE_PROXY_MSG_HELPER_
+#ifndef CHROME_BROWSER_NET_RESOLVE_PROXY_MSG_HELPER_H_
+#define CHROME_BROWSER_NET_RESOLVE_PROXY_MSG_HELPER_H_
 
 #include <deque>
 #include <string>
@@ -101,4 +101,4 @@ class ResolveProxyMsgHelper {
   scoped_refptr<net::ProxyService> proxy_service_override_;
 };
 
-#endif  // CHROME_BROWSER_NET_RESOLVE_PROXY_MSG_HELPER_
+#endif  // CHROME_BROWSER_NET_RESOLVE_PROXY_MSG_HELPER_H_
diff --git a/chrome/browser/net/sqlite_persistent_cookie_store.h b/chrome/browser/net/sqlite_persistent_cookie_store.h
index 5e3716c..e687f02 100644
--- a/chrome/browser/net/sqlite_persistent_cookie_store.h
+++ b/chrome/browser/net/sqlite_persistent_cookie_store.h
@@ -21,7 +21,7 @@ class FilePath;
 class SQLitePersistentCookieStore
     : public net::CookieMonster::PersistentCookieStore {
  public:
-  SQLitePersistentCookieStore(const FilePath& path);
+  explicit SQLitePersistentCookieStore(const FilePath& path);
   ~SQLitePersistentCookieStore();
 
   virtual bool Load(std::vector<net::CookieMonster::KeyedCanonicalCookie>*);
diff --git a/chrome/browser/net/test_url_fetcher_factory.h b/chrome/browser/net/test_url_fetcher_factory.h
index 3330ba2..12864a0 100644
--- a/chrome/browser/net/test_url_fetcher_factory.h
+++ b/chrome/browser/net/test_url_fetcher_factory.h
@@ -75,4 +75,4 @@ class TestURLFetcherFactory : public URLFetcher::Factory {
   DISALLOW_COPY_AND_ASSIGN(TestURLFetcherFactory);
 };
 
-#endif  // CHROME_TEST_TEST_URL_FETCHER_FACTORY_H_
+#endif  // CHROME_BROWSER_NET_TEST_URL_FETCHER_FACTORY_H_
diff --git a/chrome/browser/net/url_fetcher.h b/chrome/browser/net/url_fetcher.h
index f81fd69..6850a36 100644
--- a/chrome/browser/net/url_fetcher.h
+++ b/chrome/browser/net/url_fetcher.h
@@ -7,8 +7,8 @@
 // reading.  This is useful for callers who simply want to get the data from a
 // URL and don't care about all the nitty-gritty details.
 
-#ifndef CHROME_BROWSER_URL_FETCHER_H_
-#define CHROME_BROWSER_URL_FETCHER_H_
+#ifndef CHROME_BROWSER_NET_URL_FETCHER_H_
+#define CHROME_BROWSER_NET_URL_FETCHER_H_
 
 #include "base/leak_tracker.h"
 #include "base/message_loop.h"
@@ -163,4 +163,4 @@ class URLFetcher {
   DISALLOW_EVIL_CONSTRUCTORS(URLFetcher);
 };
 
-#endif  // CHROME_BROWSER_URL_FETCHER_H_
+#endif  // CHROME_BROWSER_NET_URL_FETCHER_H_
diff --git a/chrome/browser/net/url_fetcher_protect.h b/chrome/browser/net/url_fetcher_protect.h
index 5e069fa..25015ac 100644
--- a/chrome/browser/net/url_fetcher_protect.h
+++ b/chrome/browser/net/url_fetcher_protect.h
@@ -5,8 +5,8 @@
 // This file implements backoff in the suggest system so that we don't
 // DOS the Suggest servers when using URLFetcher.
 
-#ifndef CHROME_BROWSER_URL_FETCHER_PROTECT_H__
-#define CHROME_BROWSER_URL_FETCHER_PROTECT_H__
+#ifndef CHROME_BROWSER_NET_URL_FETCHER_PROTECT_H_
+#define CHROME_BROWSER_NET_URL_FETCHER_PROTECT_H_
 
 #include <map>
 #include <queue>
@@ -141,4 +141,4 @@ class URLFetcherProtectManager {
   DISALLOW_COPY_AND_ASSIGN(URLFetcherProtectManager);
 };
 
-#endif  // CHROME_BROWSER_URL_FETCHER_PROTECT_H__
+#endif  // CHROME_BROWSER_NET_URL_FETCHER_PROTECT_H_
diff --git a/chrome/browser/net/url_fixer_upper.h b/chrome/browser/net/url_fixer_upper.h
index d3db746..9a4b35b 100644
--- a/chrome/browser/net/url_fixer_upper.h
+++ b/chrome/browser/net/url_fixer_upper.h
@@ -67,4 +67,4 @@ namespace URLFixerUpper {
   extern const char* home_directory_override;
 };
 
-#endif  // #ifndef CHROME_BROWSER_NET_URL_FIXER_UPPER_H_
+#endif  // CHROME_BROWSER_NET_URL_FIXER_UPPER_H_
diff --git a/chrome/browser/net/url_request_failed_dns_job.h b/chrome/browser/net/url_request_failed_dns_job.h
index f785c1a..2c2e3367 100644
--- a/chrome/browser/net/url_request_failed_dns_job.h
+++ b/chrome/browser/net/url_request_failed_dns_job.h
@@ -10,7 +10,7 @@
 
 class URLRequestFailedDnsJob : public URLRequestJob {
  public:
-  URLRequestFailedDnsJob(URLRequest* request)
+  explicit URLRequestFailedDnsJob(URLRequest* request)
       : URLRequestJob(request) { }
 
   virtual void Start();
diff --git a/chrome/browser/net/url_request_mock_http_job.h b/chrome/browser/net/url_request_mock_http_job.h
index abfcf67..34f949b 100644
--- a/chrome/browser/net/url_request_mock_http_job.h
+++ b/chrome/browser/net/url_request_mock_http_job.h
@@ -45,4 +45,4 @@ class URLRequestMockHTTPJob : public URLRequestFileJob {
   static FilePath base_path_;
 };
 
-# endif  // CHROME_BROWSER_NET_URL_REQUEST_MOCK_HTTP_JOB_H_
+#endif  // CHROME_BROWSER_NET_URL_REQUEST_MOCK_HTTP_JOB_H_
diff --git a/chrome/browser/net/url_request_mock_link_doctor_job.h b/chrome/browser/net/url_request_mock_link_doctor_job.h
index 3f695fe..be1367f 100644
--- a/chrome/browser/net/url_request_mock_link_doctor_job.h
+++ b/chrome/browser/net/url_request_mock_link_doctor_job.h
@@ -11,7 +11,7 @@
 
 class URLRequestMockLinkDoctorJob : public URLRequestMockHTTPJob {
  public:
-  URLRequestMockLinkDoctorJob(URLRequest* request);
+  explicit URLRequestMockLinkDoctorJob(URLRequest* request);
 
   static URLRequest::ProtocolFactory Factory;
 
@@ -22,4 +22,4 @@ class URLRequestMockLinkDoctorJob : public URLRequestMockHTTPJob {
   ~URLRequestMockLinkDoctorJob() {}
 };
 
-# endif  // CHROME_BROWSER_NET_URL_REQUEST_MOCK_LINK_DOCTOR_JOB_H_
+#endif  // CHROME_BROWSER_NET_URL_REQUEST_MOCK_LINK_DOCTOR_JOB_H_
diff --git a/chrome/browser/net/url_request_mock_net_error_job.h b/chrome/browser/net/url_request_mock_net_error_job.h
index da81339..796cc0e 100644
--- a/chrome/browser/net/url_request_mock_net_error_job.h
+++ b/chrome/browser/net/url_request_mock_net_error_job.h
@@ -6,8 +6,8 @@
 // related).
 // It is based on URLRequestMockHttpJob.
 
-#ifndef CHROME_BROWSER_NET_URL_REQUEST_MOCK_NET_ERROR_H_
-#define CHROME_BROWSER_NET_URL_REQUEST_MOCK_NET_ERROR_H_
+#ifndef CHROME_BROWSER_NET_URL_REQUEST_MOCK_NET_ERROR_JOB_H_
+#define CHROME_BROWSER_NET_URL_REQUEST_MOCK_NET_ERROR_JOB_H_
 
 #include "chrome/browser/net/url_request_mock_http_job.h"
 
@@ -67,4 +67,4 @@ class URLRequestMockNetErrorJob : public URLRequestMockHTTPJob {
   DISALLOW_EVIL_CONSTRUCTORS(URLRequestMockNetErrorJob);
 };
 
-#endif  // #define CHROME_BROWSER_NET_URL_REQUEST_MOCK_NET_ERROR_H_
+#endif  // CHROME_BROWSER_NET_URL_REQUEST_MOCK_NET_ERROR_JOB_H_
diff --git a/chrome/browser/net/url_request_slow_http_job.h b/chrome/browser/net/url_request_slow_http_job.h
index 7545f4e..347d55a 100644
--- a/chrome/browser/net/url_request_slow_http_job.h
+++ b/chrome/browser/net/url_request_slow_http_job.h
@@ -40,4 +40,4 @@ class URLRequestSlowHTTPJob : public URLRequestMockHTTPJob {
   static FilePath base_path_;
 };
 
-# endif  // CHROME_BROWSER_NET_URL_REQUEST_SLOW_HTTP_JOB_H_
+#endif  // CHROME_BROWSER_NET_URL_REQUEST_SLOW_HTTP_JOB_H_
diff --git a/chrome/browser/net/websocket_experiment/websocket_experiment_task.cc b/chrome/browser/net/websocket_experiment/websocket_experiment_task.cc
index 02942af..a9a3ccc 100644
--- a/chrome/browser/net/websocket_experiment/websocket_experiment_task.cc
+++ b/chrome/browser/net/websocket_experiment/websocket_experiment_task.cc
@@ -91,8 +91,9 @@ void WebSocketExperimentTask::OnURLFetchComplete(
   if (next_state_ != STATE_URL_FETCH_COMPLETE) {
     DLOG(INFO) << "unexpected state=" << next_state_;
     result = net::ERR_UNEXPECTED;
-  } else if (response_code == 200 || response_code == 304)
+  } else if (response_code == 200 || response_code == 304) {
     result = net::OK;
+  }
   DoLoop(result);
 }
 
diff --git a/chrome/browser/notifications/desktop_notifications_unittest.h b/chrome/browser/notifications/desktop_notifications_unittest.h
index 493c35c..31b8051 100644
--- a/chrome/browser/notifications/desktop_notifications_unittest.h
+++ b/chrome/browser/notifications/desktop_notifications_unittest.h
@@ -135,4 +135,4 @@ class DesktopNotificationsTest : public testing::Test {
   static std::string log_output_;
 };
 
-#endif
+#endif  // CHROME_BROWSER_NOTIFICATIONS_DESKTOP_NOTIFICATIONS_UNITTEST_H_
diff --git a/chrome/browser/notifications/notification_object_proxy.h b/chrome/browser/notifications/notification_object_proxy.h
index 1ff17aa..46c56f5 100644
--- a/chrome/browser/notifications/notification_object_proxy.h
+++ b/chrome/browser/notifications/notification_object_proxy.h
@@ -16,8 +16,8 @@ class Message;
 // which corresponds to a notification toast on the desktop.  It can be signaled
 // when various events occur regarding the desktop notification, and the
 // attached JS listeners will be invoked in the renderer or worker process.
-class NotificationObjectProxy :
-    public base::RefCountedThreadSafe<NotificationObjectProxy> {
+class NotificationObjectProxy
+    : public base::RefCountedThreadSafe<NotificationObjectProxy> {
  public:
   // Creates a Proxy object with the necessary callback information.
   NotificationObjectProxy(int process_id, int route_id,
diff --git a/chrome/browser/notifications/notification_ui_manager.h b/chrome/browser/notifications/notification_ui_manager.h
index b386ba6..9aff1d4 100644
--- a/chrome/browser/notifications/notification_ui_manager.h
+++ b/chrome/browser/notifications/notification_ui_manager.h
@@ -19,8 +19,8 @@ class SiteInstance;
 
 // The notification manager manages use of the desktop for notifications.
 // It maintains a queue of pending notifications when space becomes constrained.
-class NotificationUIManager :
-    public BalloonCollectionImpl::BalloonSpaceChangeListener {
+class NotificationUIManager
+    : public BalloonCollectionImpl::BalloonSpaceChangeListener {
  public:
   NotificationUIManager();
   virtual ~NotificationUIManager();
diff --git a/chrome/browser/notifications/notifications_prefs_cache.h b/chrome/browser/notifications/notifications_prefs_cache.h
index 58fb873..f153e02 100644
--- a/chrome/browser/notifications/notifications_prefs_cache.h
+++ b/chrome/browser/notifications/notifications_prefs_cache.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_NOTIFICATIONS_NOTIFICATIONS_PREFS_CACHE_H
-#define CHROME_BROWSER_NOTIFICATIONS_NOTIFICATIONS_PREFS_CACHE_H
+#ifndef CHROME_BROWSER_NOTIFICATIONS_NOTIFICATIONS_PREFS_CACHE_H_
+#define CHROME_BROWSER_NOTIFICATIONS_NOTIFICATIONS_PREFS_CACHE_H_
 
 #include <set>
 
@@ -16,8 +16,8 @@ class ListValue;
 // Construction occurs on the UI thread when the contents
 // of the profile preferences are initially cached.  Once constructed
 // this class should only be accessed on the IO thread.
-class NotificationsPrefsCache :
-    public base::RefCountedThreadSafe<NotificationsPrefsCache> {
+class NotificationsPrefsCache
+    : public base::RefCountedThreadSafe<NotificationsPrefsCache> {
  public:
   NotificationsPrefsCache(const ListValue* allowed, const ListValue* denied);
 
@@ -46,4 +46,4 @@ class NotificationsPrefsCache :
   DISALLOW_COPY_AND_ASSIGN(NotificationsPrefsCache);
 };
 
-#endif  // #ifndef CHROME_BROWSER_NOTIFICATIONS_NOTIFICATIONS_PREFS_CACHE_H
+#endif  // CHROME_BROWSER_NOTIFICATIONS_NOTIFICATIONS_PREFS_CACHE_H_
diff --git a/chrome/browser/omnibox_search_hint.h b/chrome/browser/omnibox_search_hint.h
index 3d92011..456e968 100644
--- a/chrome/browser/omnibox_search_hint.h
+++ b/chrome/browser/omnibox_search_hint.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_OMNIBOX_SEARCH_HINT_
-#define CHROME_BROWSER_OMNIBOX_SEARCH_HINT_
+#ifndef CHROME_BROWSER_OMNIBOX_SEARCH_HINT_H_
+#define CHROME_BROWSER_OMNIBOX_SEARCH_HINT_H_
 
 #include <map>
 #include <string>
@@ -58,4 +58,4 @@ class OmniboxSearchHint : public NotificationObserver {
   DISALLOW_COPY_AND_ASSIGN(OmniboxSearchHint);
 };
 
-#endif  // CHROME_BROWSER_OMNIBOX_SEARCH_HINT_
+#endif  // CHROME_BROWSER_OMNIBOX_SEARCH_HINT_H_
diff --git a/chrome/browser/options_window.h b/chrome/browser/options_window.h
index a55359d..8e9a74f 100644
--- a/chrome/browser/options_window.h
+++ b/chrome/browser/options_window.h
@@ -35,4 +35,4 @@ void ShowOptionsWindow(OptionsPage page,
                        OptionsGroup highlight_group,
                        Profile* profile);
 
-#endif  // #ifndef CHROME_BROWSER_OPTIONS_WINDOW_H__
+#endif  // CHROME_BROWSER_OPTIONS_WINDOW_H_
diff --git a/chrome/browser/parsers/metadata_parser.h b/chrome/browser/parsers/metadata_parser.h
index 97a4e85..65210fa 100644
--- a/chrome/browser/parsers/metadata_parser.h
+++ b/chrome/browser/parsers/metadata_parser.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_METADATA_PARSER_H_
-#define CHROME_BROWSER_METADATA_PARSER_H_
+#ifndef CHROME_BROWSER_PARSERS_METADATA_PARSER_H_
+#define CHROME_BROWSER_PARSERS_METADATA_PARSER_H_
 
 #include <string>
 
@@ -28,7 +28,7 @@ class MetadataPropertyIterator {
 // Represents a single instance of parsing on a particular file.
 class MetadataParser {
  public:
-  MetadataParser(const FilePath& path) {}
+  explicit MetadataParser(const FilePath& path) {}
 
   static const char* kPropertyType;
   static const char* kPropertyFilesize;
@@ -45,4 +45,4 @@ class MetadataParser {
   virtual MetadataPropertyIterator* GetPropertyIterator() = 0;
 };
 
-#endif  // CHROME_BROWSER-METADATA_PARSER_H_
+#endif  // CHROME_BROWSER_PARSERS_METADATA_PARSER_H_
diff --git a/chrome/browser/parsers/metadata_parser_factory.h b/chrome/browser/parsers/metadata_parser_factory.h
index c42e01d..2636804 100644
--- a/chrome/browser/parsers/metadata_parser_factory.h
+++ b/chrome/browser/parsers/metadata_parser_factory.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_METADATA_PARSER_FACTORY_H_
-#define CHROME_BROWSER_METADATA_PARSER_FACTORY_H_
+#ifndef CHROME_BROWSER_PARSERS_METADATA_PARSER_FACTORY_H_
+#define CHROME_BROWSER_PARSERS_METADATA_PARSER_FACTORY_H_
 
 #include "chrome/browser/parsers/metadata_parser.h"
 
@@ -24,4 +24,4 @@ class MetadataParserFactory {
   virtual MetadataParser* CreateParser(const FilePath& path) = 0;
 };
 
-#endif  // CHROME_BROWSER_METADATA_PARSER_FACTORY_H_
+#endif  // CHROME_BROWSER_PARSERS_METADATA_PARSER_FACTORY_H_
diff --git a/chrome/browser/parsers/metadata_parser_filebase.h b/chrome/browser/parsers/metadata_parser_filebase.h
index 8b67a2d..b49ebfe 100644
--- a/chrome/browser/parsers/metadata_parser_filebase.h
+++ b/chrome/browser/parsers/metadata_parser_filebase.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_METADATA_PARSER_FILEBASE_H_
-#define CHROME_BROWSER_METADATA_PARSER_FILEBASE_H_
+#ifndef CHROME_BROWSER_PARSERS_METADATA_PARSER_FILEBASE_H_
+#define CHROME_BROWSER_PARSERS_METADATA_PARSER_FILEBASE_H_
 
 #include "chrome/browser/parsers/metadata_parser.h"
 
@@ -13,7 +13,7 @@ typedef base::hash_map<std::string, std::string> PropertyMap;
 // properties assiciated with files.
 class FileMetadataParser : public MetadataParser {
  public:
-  FileMetadataParser(const FilePath& path);
+  explicit FileMetadataParser(const FilePath& path);
 
   // Implementation of MetadataParser
   virtual bool Parse();
@@ -31,7 +31,7 @@ class FileMetadataParser : public MetadataParser {
 
 class FileMetadataPropertyIterator : public MetadataPropertyIterator {
  public:
-  FileMetadataPropertyIterator(PropertyMap& properties);
+  explicit FileMetadataPropertyIterator(PropertyMap& properties);
 
   // Implementation of MetadataPropertyIterator
   virtual bool GetNext(std::string* key, std::string* value);
@@ -45,4 +45,4 @@ class FileMetadataPropertyIterator : public MetadataPropertyIterator {
   DISALLOW_COPY_AND_ASSIGN(FileMetadataPropertyIterator);
 };
 
-#endif  // CHROME_BROWSER_METADATA_PARSER_FILEBASE_H_
+#endif  // CHROME_BROWSER_PARSERS_METADATA_PARSER_FILEBASE_H_
diff --git a/chrome/browser/parsers/metadata_parser_jpeg.h b/chrome/browser/parsers/metadata_parser_jpeg.h
index 449e816..779aa2b 100644
--- a/chrome/browser/parsers/metadata_parser_jpeg.h
+++ b/chrome/browser/parsers/metadata_parser_jpeg.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_METADATA_PARSER_JPEG_H_
-#define CHROME_BROWSER_METADATA_PARSER_JPEG_H_
+#ifndef CHROME_BROWSER_PARSERS_METADATA_PARSER_JPEG_H_
+#define CHROME_BROWSER_PARSERS_METADATA_PARSER_JPEG_H_
 
 #include "chrome/browser/parsers/metadata_parser_filebase.h"
 
 class JpegMetadataParser : public FileMetadataParser {
  public:
-  JpegMetadataParser(const FilePath& path);
+  explicit JpegMetadataParser(const FilePath& path);
   // Implementation of MetadataParser
   virtual bool Parse();
 
@@ -17,4 +17,4 @@ class JpegMetadataParser : public FileMetadataParser {
   DISALLOW_COPY_AND_ASSIGN(JpegMetadataParser);
 };
 
-#endif  // CHROME_BROWSER_METADATA_PARSER_JPEG_H_
+#endif  // CHROME_BROWSER_PARSERS_METADATA_PARSER_JPEG_H_
diff --git a/chrome/browser/parsers/metadata_parser_jpeg_factory.h b/chrome/browser/parsers/metadata_parser_jpeg_factory.h
index 48c059b..2ac5160 100644
--- a/chrome/browser/parsers/metadata_parser_jpeg_factory.h
+++ b/chrome/browser/parsers/metadata_parser_jpeg_factory.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_METADATA_PARSER_JPEG_FACTORY_H_
-#define CHROME_BROWSER_METADATA_PARSER_JPEG_FACTORY_H_
+#ifndef CHROME_BROWSER_PARSERS_METADATA_PARSER_JPEG_FACTORY_H_
+#define CHROME_BROWSER_PARSERS_METADATA_PARSER_JPEG_FACTORY_H_
 
 #include "chrome/browser/parsers/metadata_parser_factory.h"
 
@@ -19,4 +19,4 @@ class MetadataParserJpegFactory : public MetadataParserFactory {
   DISALLOW_COPY_AND_ASSIGN(MetadataParserJpegFactory);
 };
 
-#endif  // CHROME_BROWSER_METADATA_PARSER_JPEG_FACTORY_H_
+#endif  // CHROME_BROWSER_PARSERS_METADATA_PARSER_JPEG_FACTORY_H_
diff --git a/chrome/browser/parsers/metadata_parser_manager.h b/chrome/browser/parsers/metadata_parser_manager.h
index 3249eb2..97e289c 100644
--- a/chrome/browser/parsers/metadata_parser_manager.h
+++ b/chrome/browser/parsers/metadata_parser_manager.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_METADATA_PARSER_MANAGER_H_
-#define CHROME_BROWSER_METADATA_PARSER_MANAGER_H_
+#ifndef CHROME_BROWSER_PARSERS_METADATA_PARSER_MANAGER_H_
+#define CHROME_BROWSER_PARSERS_METADATA_PARSER_MANAGER_H_
 
 #include <vector>
 
@@ -37,4 +37,4 @@ class MetadataParserManager {
   DISALLOW_COPY_AND_ASSIGN(MetadataParserManager);
 };
 
-#endif  // CHROME_BROWSER_METADATA_PARSER_MANAGER_H_
+#endif  // CHROME_BROWSER_PARSERS_METADATA_PARSER_MANAGER_H_
diff --git a/chrome/browser/password_manager/ie7_password.h b/chrome/browser/password_manager/ie7_password.h
index 44ff972..91c81ab 100644
--- a/chrome/browser/password_manager/ie7_password.h
+++ b/chrome/browser/password_manager/ie7_password.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_IE7_PASSWORD_H__
-#define CHROME_BROWSER_IE7_PASSWORD_H__
+#ifndef CHROME_BROWSER_PASSWORD_MANAGER_IE7_PASSWORD_H_
+#define CHROME_BROWSER_PASSWORD_MANAGER_IE7_PASSWORD_H_
 
 #include <windows.h>
 #include <string>
@@ -43,4 +43,4 @@ std::wstring GetUrlHash(const std::wstring& url);
 
 }  // namespace ie7_password
 
-#endif  // CHROME_BROWSER_IE7_PASSWORD_H__
+#endif  // CHROME_BROWSER_PASSWORD_MANAGER_IE7_PASSWORD_H_
diff --git a/chrome/browser/password_manager/password_form_manager.h b/chrome/browser/password_manager/password_form_manager.h
index 058d4d6..fe6ceee 100644
--- a/chrome/browser/password_manager/password_form_manager.h
+++ b/chrome/browser/password_manager/password_form_manager.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_PASSWORD_FORM_MANAGER_H__
-#define CHROME_BROWSER_PASSWORD_FORM_MANAGER_H__
+#ifndef CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_FORM_MANAGER_H_
+#define CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_FORM_MANAGER_H_
 
 #include "build/build_config.h"
 
@@ -160,4 +160,4 @@ class PasswordFormManager : public PasswordStoreConsumer {
 
   DISALLOW_EVIL_CONSTRUCTORS(PasswordFormManager);
 };
-#endif  // CHROME_BROWSER_PASSWORD_FORM_MANAGER_H__
+#endif  // CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_FORM_MANAGER_H_
diff --git a/chrome/browser/password_manager/password_form_manager_win.cc b/chrome/browser/password_manager/password_form_manager_win.cc
deleted file mode 100644
index e69de29..0000000
--- a/chrome/browser/password_manager/password_form_manager_win.cc
+++ /dev/null
diff --git a/chrome/browser/password_manager/password_manager.h b/chrome/browser/password_manager/password_manager.h
index 085366f..285b459 100644
--- a/chrome/browser/password_manager/password_manager.h
+++ b/chrome/browser/password_manager/password_manager.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_PASSWORD_MANAGER_H__
-#define CHROME_BROWSER_PASSWORD_MANAGER_H__
+#ifndef CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_MANAGER_H_
+#define CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_MANAGER_H_
 
 #include "base/scoped_ptr.h"
 #include "base/stl_util-inl.h"
@@ -101,4 +101,4 @@ class PasswordManager : public LoginModel {
   DISALLOW_EVIL_CONSTRUCTORS(PasswordManager);
 };
 
-#endif
+#endif  // CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_MANAGER_H_
diff --git a/chrome/browser/password_manager/password_store.h b/chrome/browser/password_manager/password_store.h
index 5749824..193a8a6 100644
--- a/chrome/browser/password_manager/password_store.h
+++ b/chrome/browser/password_manager/password_store.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_PASSWORD_MANAGER_PASSWORD_STORE
-#define CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_STORE
+#ifndef CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_STORE_H_
+#define CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_STORE_H_
 
 #include <set>
 #include <vector>
@@ -145,4 +145,4 @@ class PasswordStore : public base::RefCountedThreadSafe<PasswordStore> {
   DISALLOW_COPY_AND_ASSIGN(PasswordStore);
 };
 
-#endif  // CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_STORE
+#endif  // CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_STORE_H_
diff --git a/chrome/browser/password_manager/password_store_default.h b/chrome/browser/password_manager/password_store_default.h
index 6b93481..2c26a7b 100644
--- a/chrome/browser/password_manager/password_store_default.h
+++ b/chrome/browser/password_manager/password_store_default.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_PASSWORD_MANAGER_PASSWORD_STORE_DEFAULT
-#define CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_STORE_DEFAULT
+#ifndef CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_STORE_DEFAULT_H_
+#define CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_STORE_DEFAULT_H_
 
 #include <map>
 
@@ -88,4 +88,4 @@ class PasswordStoreDefault : public PasswordStore,
   DISALLOW_COPY_AND_ASSIGN(PasswordStoreDefault);
 };
 
-#endif  // CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_STORE_DEFAULT
+#endif  // CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_STORE_DEFAULT_H_
diff --git a/chrome/browser/password_manager/password_store_gnome.h b/chrome/browser/password_manager/password_store_gnome.h
index efaafc0..f448ad1 100644
--- a/chrome/browser/password_manager/password_store_gnome.h
+++ b/chrome/browser/password_manager/password_store_gnome.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_PASSWORD_MANAGER_PASSWORD_STORE_GNOME
-#define CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_STORE_GNOME
+#ifndef CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_STORE_GNOME_H_
+#define CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_STORE_GNOME_H_
 
 extern "C" {
 #include <gnome-keyring.h>
@@ -38,4 +38,4 @@ class PasswordStoreGnome : public PasswordStore {
   DISALLOW_COPY_AND_ASSIGN(PasswordStoreGnome);
 };
 
-#endif  // CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_STORE_GNOME
+#endif  // CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_STORE_GNOME_H_
diff --git a/chrome/browser/password_manager/password_store_kwallet.h b/chrome/browser/password_manager/password_store_kwallet.h
index b60d374..317cbdb 100644
--- a/chrome/browser/password_manager/password_store_kwallet.h
+++ b/chrome/browser/password_manager/password_store_kwallet.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_PASSWORD_MANAGER_PASSWORD_STORE_KWALLET
-#define CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_STORE_KWALLET
+#ifndef CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_STORE_KWALLET_H_
+#define CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_STORE_KWALLET_H_
 
 #include <dbus/dbus-glib.h>
 #include <glib.h>
@@ -109,4 +109,4 @@ class PasswordStoreKWallet : public PasswordStore {
   DISALLOW_COPY_AND_ASSIGN(PasswordStoreKWallet);
 };
 
-#endif  // CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_STORE_KWALLET
+#endif  // CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_STORE_KWALLET_H_
diff --git a/chrome/browser/password_manager/password_store_win.h b/chrome/browser/password_manager/password_store_win.h
index 7a11dae..924fc07 100644
--- a/chrome/browser/password_manager/password_store_win.h
+++ b/chrome/browser/password_manager/password_store_win.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_PASSWORD_MANAGER_PASSWORD_STORE_WIN
-#define CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_STORE_WIN
+#ifndef CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_STORE_WIN_H_
+#define CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_STORE_WIN_H_
 
 #include <map>
 #include <vector>
@@ -55,4 +55,4 @@ class PasswordStoreWin : public PasswordStoreDefault {
   DISALLOW_COPY_AND_ASSIGN(PasswordStoreWin);
 };
 
-#endif  // CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_STORE_WIN
+#endif  // CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_STORE_WIN_H_
diff --git a/chrome/browser/printing/print_job_worker_owner.h b/chrome/browser/printing/print_job_worker_owner.h
index 510f15f..cd600ef 100644
--- a/chrome/browser/printing/print_job_worker_owner.h
+++ b/chrome/browser/printing/print_job_worker_owner.h
@@ -15,10 +15,9 @@ namespace printing {
 class PrintJobWorker;
 class PrintSettings;
 
-class PrintJobWorkerOwner :
-    public base::RefCountedThreadSafe<PrintJobWorkerOwner> {
+class PrintJobWorkerOwner
+    : public base::RefCountedThreadSafe<PrintJobWorkerOwner> {
  public:
-
   // Finishes the initialization began by PrintJobWorker::Init(). Creates a
   // new PrintedDocument if necessary. Solely meant to be called by
   // PrintJobWorker.
diff --git a/chrome/browser/printing/print_view_manager.h b/chrome/browser/printing/print_view_manager.h
index ee87fa2..f599541 100644
--- a/chrome/browser/printing/print_view_manager.h
+++ b/chrome/browser/printing/print_view_manager.h
@@ -26,7 +26,7 @@ class PrintViewManager : public NotificationObserver,
                          public PrintedPagesSource,
                          public RenderViewHostDelegate::Printing {
  public:
-  PrintViewManager(TabContents& owner);
+  explicit PrintViewManager(TabContents& owner);
   virtual ~PrintViewManager();
 
   // Cancels the print job.
diff --git a/chrome/browser/privacy_blacklist/blacklist.h b/chrome/browser/privacy_blacklist/blacklist.h
index c57efff..1999a09 100644
--- a/chrome/browser/privacy_blacklist/blacklist.h
+++ b/chrome/browser/privacy_blacklist/blacklist.h
@@ -28,10 +28,10 @@ class Blacklist {
  public:
   class Entry;
   class Provider;
-  
+
   typedef std::vector<linked_ptr<Entry> > EntryList;
   typedef std::vector<linked_ptr<Provider> > ProviderList;
-  
+
   // Filter attributes (more to come):
   static const unsigned int kBlockAll;
   static const unsigned int kDontSendCookies;
@@ -79,7 +79,7 @@ class Blacklist {
    public:
     // Construct with given pattern.
     Entry(const std::string& pattern, const Provider* provider);
-    
+
     // Returns the pattern which this entry matches.
     const std::string& pattern() const { return pattern_; }
 
@@ -101,13 +101,13 @@ class Blacklist {
 
     void AddAttributes(unsigned int attributes);
     void AddType(const std::string& type);
-    
+
     // Swap the contents of the internal types vector with the given vector.
     void SwapTypes(std::vector<std::string>* types);
 
    private:
     friend class BlacklistIO;
-    
+
     // Merge the attributes and types of the given entry with this one.
     void Merge(const Entry& entry);
 
@@ -150,25 +150,25 @@ class Blacklist {
 
   // Destructor.
   ~Blacklist();
-  
+
   // Adds a new entry to the blacklist. It is now owned by the blacklist.
   void AddEntry(Entry* entry);
-  
+
   // Adds a new provider to the blacklist. It is now owned by the blacklist.
   void AddProvider(Provider* provider);
-  
+
   EntryList::const_iterator entries_begin() const {
     return blacklist_.begin();
   }
-  
+
   EntryList::const_iterator entries_end() const {
     return blacklist_.end();
   }
-  
+
   ProviderList::const_iterator providers_begin() const {
     return providers_.begin();
   }
-  
+
   ProviderList::const_iterator providers_end() const {
     return providers_.end();
   }
diff --git a/chrome/browser/privacy_blacklist/blacklist_io.cc b/chrome/browser/privacy_blacklist/blacklist_io.cc
index e8578ec..b6ff260 100644
--- a/chrome/browser/privacy_blacklist/blacklist_io.cc
+++ b/chrome/browser/privacy_blacklist/blacklist_io.cc
@@ -47,7 +47,7 @@ bool BlacklistIO::ReadText(Blacklist* blacklist,
                            const FilePath& path,
                            std::string* error_string) {
   DCHECK(blacklist);
-  
+
   // Memory map for efficient parsing. If the file cannot fit in available
   // memory it would be the least of our worries. Typical blacklist files
   // are less than 200K.
@@ -56,36 +56,36 @@ bool BlacklistIO::ReadText(Blacklist* blacklist,
     *error_string = "File I/O error. Check path and permissions.";
     return false;
   }
-  
+
   const char* cur = reinterpret_cast<const char*>(input.data());
   const char* end = cur + input.length();
-  
+
   // Check header.
   if (!StartsWith(cur, end, header, arraysize(header))) {
     *error_string = "Incorrect header.";
     return false;
   }
-  
+
   Blacklist::EntryList entries;
   Blacklist::ProviderList providers;
-  
+
   Blacklist::Provider* provider = new Blacklist::Provider;
   providers.push_back(linked_ptr<Blacklist::Provider>(provider));
-  
+
   cur = std::find(cur, end, '\n') + 1;  // Skip past EOL.
-  
+
   // Each loop iteration takes care of one input line.
   while (cur < end) {
     // Skip whitespace at beginning of line.
     cur = std::find_if(cur, end, IsNotWhiteSpace());
     if (cur == end)
       break;
-    
+
     if (*cur == '#') {
       cur = std::find(cur, end, '\n') + 1;
       continue;
     }
-    
+
     if (*cur == '|') {
       ++cur;
       if (StartsWith(cur, end, name_tag, arraysize(name_tag))) {
@@ -104,29 +104,29 @@ bool BlacklistIO::ReadText(Blacklist* blacklist,
       cur = std::find(cur, end, '\n') + 1;
       continue;
     }
-    
+
     const char* skip = std::find_if(cur, end, IsWhiteSpace());
     std::string pattern(cur, skip);
-    
+
     cur = std::find_if(cur + pattern.size(), end, IsNotWhiteSpace());
     if (!StartsWith(cur, end, arrow_tag, arraysize(arrow_tag))) {
       *error_string = "Missing => in rule.";
       return false;
     }
-    
+
     linked_ptr<Blacklist::Entry> entry(new Blacklist::Entry(pattern, provider));
-    
+
     cur = std::find_if(cur + arraysize(arrow_tag), end, IsNotWhiteSpace());
     skip = std::find_first_of(cur, end, eol, eol + 2);
     std::string buf(cur, skip);
     cur = skip + 1;
-    
+
     StringTokenizer tokenizer(buf, " (),\n\r");
     tokenizer.set_options(StringTokenizer::RETURN_DELIMS);
-    
+
     bool in_attribute = false;
     unsigned int last_attribute = 0;
-    
+
     while (tokenizer.GetNext()) {
       if (tokenizer.token_is_delim()) {
         switch (*tokenizer.token_begin()) {
@@ -149,7 +149,7 @@ bool BlacklistIO::ReadText(Blacklist* blacklist,
             continue;
         }
       }
-      
+
       if (in_attribute) {
         // The only attribute to support sub_tokens is kBlockByType, for now.
         if (last_attribute == Blacklist::kBlockByType)
@@ -162,7 +162,7 @@ bool BlacklistIO::ReadText(Blacklist* blacklist,
     }
     entries.push_back(entry);
   }
-  
+
   for (Blacklist::EntryList::iterator i = entries.begin();
        i != entries.end(); ++i) {
     blacklist->AddEntry(i->release());
@@ -171,29 +171,29 @@ bool BlacklistIO::ReadText(Blacklist* blacklist,
        i != providers.end(); ++i) {
     blacklist->AddProvider(i->release());
   }
-  
+
   return true;
 }
 
 // static
 bool BlacklistIO::ReadBinary(Blacklist* blacklist, const FilePath& path) {
   DCHECK(blacklist);
-  
+
   FILE* fp = file_util::OpenFile(path, "rb");
   if (fp == NULL)
     return false;
-  
+
   BlacklistStoreInput input(fp);
-  
+
   // Read the providers.
   uint32 num_providers = input.ReadNumProviders();
   if (num_providers == std::numeric_limits<uint32>::max())
     return false;
-  
+
   Blacklist::EntryList entries;
   Blacklist::ProviderList providers;
   std::map<size_t, Blacklist::Provider*> provider_map;
-  
+
   std::string name;
   std::string url;
   for (size_t i = 0; i < num_providers; ++i) {
@@ -202,26 +202,26 @@ bool BlacklistIO::ReadBinary(Blacklist* blacklist, const FilePath& path) {
     provider_map[i] = new Blacklist::Provider(name.c_str(), url.c_str());
     providers.push_back(linked_ptr<Blacklist::Provider>(provider_map[i]));
   }
-  
+
   // Read the entries.
   uint32 num_entries = input.ReadNumEntries();
   if (num_entries == std::numeric_limits<uint32>::max())
     return false;
-  
+
   std::string pattern;
   unsigned int attributes, provider;
   std::vector<std::string> types;
   for (size_t i = 0; i < num_entries; ++i) {
     if (!input.ReadEntry(&pattern, &attributes, &types, &provider))
       return false;
-    
+
     Blacklist::Entry* entry =
         new Blacklist::Entry(pattern, provider_map[provider]);
     entry->AddAttributes(attributes);
     entry->SwapTypes(&types);
     entries.push_back(linked_ptr<Blacklist::Entry>(entry));
   }
-  
+
   for (Blacklist::EntryList::iterator i = entries.begin();
        i != entries.end(); ++i) {
     blacklist->AddEntry(i->release());
@@ -230,8 +230,8 @@ bool BlacklistIO::ReadBinary(Blacklist* blacklist, const FilePath& path) {
        i != providers.end(); ++i) {
     blacklist->AddProvider(i->release());
   }
-  
-  return true;  
+
+  return true;
 }
 
 // static
@@ -240,7 +240,7 @@ bool BlacklistIO::WriteBinary(const Blacklist* blacklist,
   BlacklistStoreOutput output(file_util::OpenFile(file, "wb"));
   if (!output.is_good())
     return false;
-  
+
   Blacklist::EntryList entries(blacklist->entries_begin(),
                                blacklist->entries_end());
   Blacklist::ProviderList providers(blacklist->providers_begin(),
diff --git a/chrome/browser/privacy_blacklist/blacklist_io.h b/chrome/browser/privacy_blacklist/blacklist_io.h
index 2fac21d..168c241 100644
--- a/chrome/browser/privacy_blacklist/blacklist_io.h
+++ b/chrome/browser/privacy_blacklist/blacklist_io.h
@@ -17,11 +17,11 @@ class BlacklistIO {
   // On error returns false and fills |error_string|.
   static bool ReadText(Blacklist* blacklist, const FilePath& path,
                        std::string* error_string);
-  
+
   // Reads a blacklist stored on disk in a binary format.
   // Returns true on success.
   static bool ReadBinary(Blacklist* blacklist, const FilePath& path);
-  
+
   // Writes |blacklist| to |path| in a binary format. Returns true on success.
   static bool WriteBinary(const Blacklist* blacklist, const FilePath& path);
 };
diff --git a/chrome/browser/privacy_blacklist/blacklist_store.h b/chrome/browser/privacy_blacklist/blacklist_store.h
index 9a7ba93..5907fb7 100644
--- a/chrome/browser/privacy_blacklist/blacklist_store.h
+++ b/chrome/browser/privacy_blacklist/blacklist_store.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_PRIVACY_BLACKLIST_BLACKLIST_DB_H_
-#define CHROME_BROWSER_PRIVACY_BLACKLIST_BLACKLIST_DB_H_
+#ifndef CHROME_BROWSER_PRIVACY_BLACKLIST_BLACKLIST_STORE_H_
+#define CHROME_BROWSER_PRIVACY_BLACKLIST_BLACKLIST_STORE_H_
 
 #include <cstdio>
 #include <string>
@@ -98,4 +98,4 @@ class BlacklistStoreInput {
   DISALLOW_COPY_AND_ASSIGN(BlacklistStoreInput);
 };
 
-#endif
+#endif  // CHROME_BROWSER_PRIVACY_BLACKLIST_BLACKLIST_STORE_H_
diff --git a/chrome/browser/privacy_blacklist/blocked_response.h b/chrome/browser/privacy_blacklist/blocked_response.h
index a9e57bd..2d38b6e 100644
--- a/chrome/browser/privacy_blacklist/blocked_response.h
+++ b/chrome/browser/privacy_blacklist/blocked_response.h
@@ -22,7 +22,7 @@ extern const char kBlockScheme[];
 
 class BlockedResponse {
  public:
-  BlockedResponse() {};
+  BlockedResponse() {}
 
   // Returns the HTML document used as substituted content for blacklisted
   // elements.
diff --git a/chrome/browser/profile.cc b/chrome/browser/profile.cc
index 943ef84..6926557 100644
--- a/chrome/browser/profile.cc
+++ b/chrome/browser/profile.cc
@@ -1040,8 +1040,8 @@ TemplateURLFetcher* ProfileImpl::GetTemplateURLFetcher() {
   return template_url_fetcher_.get();
 }
 
-SearchVersusNavigateClassifier* ProfileImpl::GetSearchVersusNavigateClassifier()
-{
+SearchVersusNavigateClassifier*
+ProfileImpl::GetSearchVersusNavigateClassifier() {
   if (!search_versus_navigate_classifier_.get()) {
     search_versus_navigate_classifier_.reset(
         new SearchVersusNavigateClassifier(this));
diff --git a/chrome/browser/renderer_host/backing_store.h b/chrome/browser/renderer_host/backing_store.h
index 8130498..f8478b7 100644
--- a/chrome/browser/renderer_host/backing_store.h
+++ b/chrome/browser/renderer_host/backing_store.h
@@ -72,7 +72,7 @@ class BackingStore {
   void PaintToRect(const gfx::Rect& dest_rect, CGContextRef target);
 #elif defined(OS_LINUX)
   Display* display() const { return display_; }
-  XID root_window() const { return root_window_; };
+  XID root_window() const { return root_window_; }
 
   // Copy from the server-side backing store to the target window
   //   display: the display of the backing store and target window
diff --git a/chrome/browser/renderer_host/mock_render_process_host.h b/chrome/browser/renderer_host/mock_render_process_host.h
index 56e3bb3..005225f2 100644
--- a/chrome/browser/renderer_host/mock_render_process_host.h
+++ b/chrome/browser/renderer_host/mock_render_process_host.h
@@ -15,7 +15,7 @@ class TransportDIB;
 // IPC messages are sent into the message sink for inspection by tests.
 class MockRenderProcessHost : public RenderProcessHost {
  public:
-  MockRenderProcessHost(Profile* profile);
+  explicit MockRenderProcessHost(Profile* profile);
   virtual ~MockRenderProcessHost();
 
   // Provides access to all IPC messages that would have been sent to the
diff --git a/chrome/browser/renderer_host/render_process_host.h b/chrome/browser/renderer_host/render_process_host.h
index 5b1bfc7..2887f88 100644
--- a/chrome/browser/renderer_host/render_process_host.h
+++ b/chrome/browser/renderer_host/render_process_host.h
@@ -41,7 +41,7 @@ class RenderProcessHost : public IPC::Channel::Sender,
     TYPE_EXTENSION,  // Renderer with extension privileges.
   };
 
-  RenderProcessHost(Profile* profile);
+  explicit RenderProcessHost(Profile* profile);
   virtual ~RenderProcessHost();
 
   // Returns the user profile associated with this renderer process.
diff --git a/chrome/browser/renderer_host/render_widget_helper.h b/chrome/browser/renderer_host/render_widget_helper.h
index 780fc35..1220970 100644
--- a/chrome/browser/renderer_host/render_widget_helper.h
+++ b/chrome/browser/renderer_host/render_widget_helper.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_RENDEDER_HOST_RENDER_WIDGET_HELPER_H_
-#define CHROME_BROWSER_RENDEDER_HOST_RENDER_WIDGET_HELPER_H_
+#ifndef CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HELPER_H_
+#define CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HELPER_H_
 
 #include <map>
 
@@ -84,8 +84,8 @@ struct ViewMsg_ClosePage_Params;
 //   allocation and maintains the set of allocated transport DIBs which the
 //   renderers can refer to.
 //
-class RenderWidgetHelper :
-    public base::RefCountedThreadSafe<RenderWidgetHelper> {
+class RenderWidgetHelper
+    : public base::RefCountedThreadSafe<RenderWidgetHelper> {
  public:
   RenderWidgetHelper();
 
@@ -195,4 +195,4 @@ class RenderWidgetHelper :
   DISALLOW_COPY_AND_ASSIGN(RenderWidgetHelper);
 };
 
-#endif  // CHROME_BROWSER_RENDEDER_HOST_RENDER_WIDGET_HELPER_H_
+#endif  // CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HELPER_H_
diff --git a/chrome/browser/renderer_host/render_widget_host_view.h b/chrome/browser/renderer_host/render_widget_host_view.h
index d641b4e..3a71011 100644
--- a/chrome/browser/renderer_host/render_widget_host_view.h
+++ b/chrome/browser/renderer_host/render_widget_host_view.h
@@ -33,7 +33,7 @@ struct WebMenuItem;
 // changes.
 class RenderWidgetHostView {
  public:
-  virtual ~RenderWidgetHostView(){};
+  virtual ~RenderWidgetHostView() {}
 
   // Platform-specific creator. Use this to construct new RenderWidgetHostViews
   // rather than using RenderWidgetHostViewWin & friends.
@@ -133,7 +133,7 @@ class RenderWidgetHostView {
   virtual void SetTooltipText(const std::wstring& tooltip_text) = 0;
 
   // Notifies the View that the renderer text selection has changed.
-  virtual void SelectionChanged(const std::string& text) { };
+  virtual void SelectionChanged(const std::string& text) {}
 
   // Tells the View whether the context menu is showing. This is used on Linux
   // to suppress updates to webkit focus for the duration of the show.
diff --git a/chrome/browser/renderer_host/render_widget_host_view_win.h b/chrome/browser/renderer_host/render_widget_host_view_win.h
index 2fc3d80..57b220b 100644
--- a/chrome/browser/renderer_host/render_widget_host_view_win.h
+++ b/chrome/browser/renderer_host/render_widget_host_view_win.h
@@ -49,11 +49,11 @@ static const wchar_t* const kRenderWidgetHostHWNDClass =
 //     If the render process dies, the RenderWidgetHostHWND goes away and all
 //     references to it must become NULL."
 //
-class RenderWidgetHostViewWin :
-  public CWindowImpl<RenderWidgetHostViewWin,
-                     CWindow,
-                     RenderWidgetHostHWNDTraits>,
-  public RenderWidgetHostView {
+class RenderWidgetHostViewWin
+    : public CWindowImpl<RenderWidgetHostViewWin,
+                         CWindow,
+                         RenderWidgetHostHWNDTraits>,
+      public RenderWidgetHostView {
  public:
   // The view will associate itself with the given widget.
   explicit RenderWidgetHostViewWin(RenderWidgetHost* widget);
diff --git a/chrome/browser/renderer_host/site_instance.h b/chrome/browser/renderer_host/site_instance.h
index f68789e..9c2f3f8 100644
--- a/chrome/browser/renderer_host/site_instance.h
+++ b/chrome/browser/renderer_host/site_instance.h
@@ -138,7 +138,7 @@ class SiteInstance : public base::RefCounted<SiteInstance>,
   // Create a new SiteInstance.  Protected to give access to BrowsingInstance
   // and tests; most callers should use CreateSiteInstance or
   // GetRelatedSiteInstance instead.
-  SiteInstance(BrowsingInstance* browsing_instance);
+  explicit SiteInstance(BrowsingInstance* browsing_instance);
 
   // Returns the type of renderer process this instance belongs in, for grouping
   // purposes.
diff --git a/chrome/browser/renderer_host/test/test_render_view_host.h b/chrome/browser/renderer_host/test/test_render_view_host.h
index 0eb1632..cc58d37 100644
--- a/chrome/browser/renderer_host/test/test_render_view_host.h
+++ b/chrome/browser/renderer_host/test/test_render_view_host.h
@@ -155,7 +155,7 @@ class TestRenderViewHost : public RenderViewHost {
 // registered at a time, you can only have one of these objects at a time.
 class TestRenderViewHostFactory : public RenderViewHostFactory {
  public:
-  TestRenderViewHostFactory(RenderProcessHostFactory* rph_factory)
+  explicit TestRenderViewHostFactory(RenderProcessHostFactory* rph_factory)
       : render_process_host_factory_(rph_factory) {
     RenderViewHostFactory::RegisterFactory(this);
   }
diff --git a/chrome/browser/renderer_host/web_cache_manager.h b/chrome/browser/renderer_host/web_cache_manager.h
index db95280..360d966 100644
--- a/chrome/browser/renderer_host/web_cache_manager.h
+++ b/chrome/browser/renderer_host/web_cache_manager.h
@@ -5,8 +5,8 @@
 // This is the browser side of the cache manager, it tracks the activity of the
 // render processes and allocates available memory cache resources.
 
-#ifndef CHROME_BROWSER_WEB_CACHE_MANAGER_H_
-#define CHROME_BROWSER_WEB_CACHE_MANAGER_H_
+#ifndef CHROME_BROWSER_RENDERER_HOST_WEB_CACHE_MANAGER_H_
+#define CHROME_BROWSER_RENDERER_HOST_WEB_CACHE_MANAGER_H_
 
 #include <map>
 #include <list>
@@ -192,4 +192,4 @@ class WebCacheManager {
   DISALLOW_COPY_AND_ASSIGN(WebCacheManager);
 };
 
-#endif  // CHROME_BROWSER_WEB_CACHE_MANAGER_H_
+#endif  // CHROME_BROWSER_RENDERER_HOST_WEB_CACHE_MANAGER_H_
diff --git a/chrome/browser/renderer_host/x509_user_cert_resource_handler.h b/chrome/browser/renderer_host/x509_user_cert_resource_handler.h
index d9988ed..a7bf5cd 100644
--- a/chrome/browser/renderer_host/x509_user_cert_resource_handler.h
+++ b/chrome/browser/renderer_host/x509_user_cert_resource_handler.h
@@ -57,4 +57,4 @@ class X509UserCertResourceHandler : public ResourceHandler {
   DISALLOW_COPY_AND_ASSIGN(X509UserCertResourceHandler);
 };
 
-#endif  // CHROME_BROWSER_RENDERER_HOST_X509_USER_CERT__RESOURCE_HANDLER_H_
+#endif  // CHROME_BROWSER_RENDERER_HOST_X509_USER_CERT_RESOURCE_HANDLER_H_
diff --git a/chrome/browser/safe_browsing/chunk_range.h b/chrome/browser/safe_browsing/chunk_range.h
index a9969b1..10d97f4 100644
--- a/chrome/browser/safe_browsing/chunk_range.h
+++ b/chrome/browser/safe_browsing/chunk_range.h
@@ -22,7 +22,7 @@
 
 class ChunkRange {
  public:
-  ChunkRange(int start);
+  explicit ChunkRange(int start);
   ChunkRange(int start, int stop);
   ChunkRange(const ChunkRange& rhs);
 
diff --git a/chrome/browser/safe_browsing/safe_browsing_util.h b/chrome/browser/safe_browsing/safe_browsing_util.h
index 8c2d60b..44c94c4 100644
--- a/chrome/browser/safe_browsing/safe_browsing_util.h
+++ b/chrome/browser/safe_browsing/safe_browsing_util.h
@@ -18,7 +18,7 @@
 
 class GURL;
 
-//#define SB_LOGGING_ENABLED
+// #define SB_LOGGING_ENABLED
 #ifdef SB_LOGGING_ENABLED
 #define SB_DLOG(severity) DLOG_IF(INFO, 1)
 #else
@@ -77,7 +77,7 @@ struct SBListChunkRanges {
   std::string adds;  // The ranges for add chunks.
   std::string subs;  // The ranges for sub chunks.
 
-  SBListChunkRanges(const std::string& n) : name(n) { }
+  explicit SBListChunkRanges(const std::string& n) : name(n) { }
 };
 
 // Container for deleting chunks from the database.
diff --git a/chrome/browser/search_engines/template_url.h b/chrome/browser/search_engines/template_url.h
index 2d8228b..9462363 100644
--- a/chrome/browser/search_engines/template_url.h
+++ b/chrome/browser/search_engines/template_url.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_TEMPLATE_URL_H__
-#define CHROME_BROWSER_TEMPLATE_URL_H__
+#ifndef CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_H_
+#define CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_H_
 
 #include <vector>
 
@@ -439,4 +439,4 @@ class TemplateURL {
   // TODO(sky): Add date last parsed OSD file.
 };
 
-#endif // CHROME_BROWSER_TEMPLATE_URL_PARSER_H__
+#endif  // CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_H_
diff --git a/chrome/browser/search_engines/template_url_fetcher.h b/chrome/browser/search_engines/template_url_fetcher.h
index bbd314f..911ceeb 100644
--- a/chrome/browser/search_engines/template_url_fetcher.h
+++ b/chrome/browser/search_engines/template_url_fetcher.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_TEMPLATE_URL_FETCHER_H_
-#define CHROME_BROWSER_TEMPLATE_URL_FETCHER_H_
+#ifndef CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_FETCHER_H_
+#define CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_FETCHER_H_
 
 #include "app/gfx/native_widget_types.h"
 #include "base/scoped_vector.h"
@@ -52,4 +52,4 @@ class TemplateURLFetcher {
   DISALLOW_COPY_AND_ASSIGN(TemplateURLFetcher);
 };
 
-#endif  // CHROME_BROWSER_OSDD_FETCHER_H_
+#endif  // CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_FETCHER_H_
diff --git a/chrome/browser/search_engines/template_url_model.cc b/chrome/browser/search_engines/template_url_model.cc
index f42f164..0d7bc58 100644
--- a/chrome/browser/search_engines/template_url_model.cc
+++ b/chrome/browser/search_engines/template_url_model.cc
@@ -988,7 +988,7 @@ bool TemplateURLModel::BuildQueryTerms(const GURL& url,
           // this as if the term doesn't occur by setting the value to an empty
           // string.
           (*query_terms)[key_string] = std::string();
-          DCHECK (valid_term_count > 0);
+          DCHECK(valid_term_count > 0);
           valid_term_count--;
         }
       } else {
diff --git a/chrome/browser/search_engines/template_url_model.h b/chrome/browser/search_engines/template_url_model.h
index 0803153..044ec23 100644
--- a/chrome/browser/search_engines/template_url_model.h
+++ b/chrome/browser/search_engines/template_url_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_TEMPLATE_URL_MODEL_H__
-#define CHROME_BROWSER_TEMPLATE_URL_MODEL_H__
+#ifndef CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_MODEL_H_
+#define CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_MODEL_H_
 
 #include <set>
 
@@ -351,4 +351,4 @@ class TemplateURLModel : public WebDataServiceConsumer,
   DISALLOW_EVIL_CONSTRUCTORS(TemplateURLModel);
 };
 
-#endif  // CHROME_BROWSER_TEMPLATE_URL_MODEL_H__
+#endif  // CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_MODEL_H_
diff --git a/chrome/browser/search_engines/template_url_parser.cc b/chrome/browser/search_engines/template_url_parser.cc
index 8c44933..60947c6 100644
--- a/chrome/browser/search_engines/template_url_parser.cc
+++ b/chrome/browser/search_engines/template_url_parser.cc
@@ -252,7 +252,7 @@ class ParsingContext {
   DISALLOW_EVIL_CONSTRUCTORS(ParsingContext);
 };
 
-//static
+// static
 std::map<std::string,ParsingContext::ElementType>*
     ParsingContext::kElementNameToElementTypeMap = NULL;
 
diff --git a/chrome/browser/search_engines/template_url_parser.h b/chrome/browser/search_engines/template_url_parser.h
index 65a4881..1a47a91 100644
--- a/chrome/browser/search_engines/template_url_parser.h
+++ b/chrome/browser/search_engines/template_url_parser.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_TEMPLATE_URL_PARSER_H__
-#define CHROME_BROWSER_TEMPLATE_URL_PARSER_H__
+#ifndef CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_PARSER_H_
+#define CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_PARSER_H_
 
 #include <string>
 
@@ -44,4 +44,4 @@ class TemplateURLParser {
   DISALLOW_EVIL_CONSTRUCTORS(TemplateURLParser);
 };
 
-#endif // CHROME_BROWSER_TEMPLATE_URL_PARSER_H__
+#endif  // CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_PARSER_H_
diff --git a/chrome/browser/search_engines/template_url_prepopulate_data.h b/chrome/browser/search_engines/template_url_prepopulate_data.h
index 9de3328..4826200 100644
--- a/chrome/browser/search_engines/template_url_prepopulate_data.h
+++ b/chrome/browser/search_engines/template_url_prepopulate_data.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_TEMPLATE_URL_PREPOPULATE_DATA_H__
-#define CHROME_BROWSER_TEMPLATE_URL_PREPOPULATE_DATA_H__
+#ifndef CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_PREPOPULATE_DATA_H_
+#define CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_PREPOPULATE_DATA_H_
 
 #include <vector>
 
@@ -28,4 +28,4 @@ void GetPrepopulatedEngines(PrefService* prefs,
 
 }  // namespace TemplateURLPrepopulateData
 
-#endif  // CHROME_BROWSER_TEMPLATE_URL_PREPOPULATE_DATA_H__
+#endif  // CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_PREPOPULATE_DATA_H_
diff --git a/chrome/browser/sessions/session_backend.h b/chrome/browser/sessions/session_backend.h
index 2ac9a97..51485c8 100644
--- a/chrome/browser/sessions/session_backend.h
+++ b/chrome/browser/sessions/session_backend.h
@@ -135,4 +135,4 @@ class SessionBackend : public base::RefCountedThreadSafe<SessionBackend> {
   DISALLOW_COPY_AND_ASSIGN(SessionBackend);
 };
 
-#endif  // #define CHROME_BROWSER_SESSIONS_SESSION_BACKEND_H_
+#endif  // CHROME_BROWSER_SESSIONS_SESSION_BACKEND_H_
diff --git a/chrome/browser/sessions/session_service_test_helper.h b/chrome/browser/sessions/session_service_test_helper.h
index 4eaa229..0f04635 100644
--- a/chrome/browser/sessions/session_service_test_helper.h
+++ b/chrome/browser/sessions/session_service_test_helper.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_SESSIONS_SERVICE_TEST_HELPER_H_
-#define CHROME_BROWSER_SESSIONS_SERVICE_TEST_HELPER_H_
+#ifndef CHROME_BROWSER_SESSIONS_SESSION_SERVICE_TEST_HELPER_H_
+#define CHROME_BROWSER_SESSIONS_SESSION_SERVICE_TEST_HELPER_H_
 
 #include <vector>
 
@@ -67,4 +67,4 @@ class SessionServiceTestHelper {
   DISALLOW_COPY_AND_ASSIGN(SessionServiceTestHelper);
 };
 
-#endif  // CHROME_BROWSER_SESSIONS_SERVICE_TEST_HELPER_H_
+#endif  // CHROME_BROWSER_SESSIONS_SESSION_SERVICE_TEST_HELPER_H_
diff --git a/chrome/browser/shell_dialogs.h b/chrome/browser/shell_dialogs.h
index 3765864..61a89fc 100644
--- a/chrome/browser/shell_dialogs.h
+++ b/chrome/browser/shell_dialogs.h
@@ -56,12 +56,12 @@ class SelectFileDialog
     // Notifies the Listener that many files have been selected. The
     // files are in |files|. |params| is contextual passed to SelectFile.
     virtual void MultiFilesSelected(
-      const std::vector<FilePath>& files, void* params) {};
+      const std::vector<FilePath>& files, void* params) {}
 
     // Notifies the Listener that the file/folder selection was aborted (via
     // the  user canceling or closing the selection dialog box, for example).
     // |params| is contextual passed to SelectFile.
-    virtual void FileSelectionCanceled(void* params) {};
+    virtual void FileSelectionCanceled(void* params) {}
   };
 
   // Creates a dialog box helper. This object is ref-counted, but the returned
@@ -141,7 +141,7 @@ class SelectFontDialog
     // Notifies the Listener that the font selection was aborted (via the user
     // canceling or closing the selection dialog box, for example). |params| is
     // contextual passed to SelectFont.
-    virtual void FontSelectionCanceled(void* params) {};
+    virtual void FontSelectionCanceled(void* params) {}
   };
 
   // Creates a dialog box helper. This object is ref-counted, but the returned
diff --git a/chrome/browser/spellcheck_host.h b/chrome/browser/spellcheck_host.h
index 437b982..d0bc6ee 100644
--- a/chrome/browser/spellcheck_host.h
+++ b/chrome/browser/spellcheck_host.h
@@ -35,7 +35,7 @@ class SpellCheckHost : public base::RefCountedThreadSafe<SpellCheckHost,
   // update.
   void AddWord(const std::string& word);
 
-  const base::PlatformFile& bdict_file() const { return file_; };
+  const base::PlatformFile& bdict_file() const { return file_; }
 
   const std::vector<std::string>& custom_words() const { return custom_words_; }
 
diff --git a/chrome/browser/ssl/ssl_blocking_page.h b/chrome/browser/ssl/ssl_blocking_page.h
index b83e16a..8ef9b28 100644
--- a/chrome/browser/ssl/ssl_blocking_page.h
+++ b/chrome/browser/ssl/ssl_blocking_page.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_SSL_BLOCKING_PAGE_H_
-#define CHROME_BROWSER_SSL_BLOCKING_PAGE_H_
+#ifndef CHROME_BROWSER_SSL_SSL_BLOCKING_PAGE_H_
+#define CHROME_BROWSER_SSL_SSL_BLOCKING_PAGE_H_
 
 #include <string>
 
@@ -70,4 +70,4 @@ class SSLBlockingPage : public InterstitialPage {
   DISALLOW_COPY_AND_ASSIGN(SSLBlockingPage);
 };
 
-#endif  // #ifndef CHROME_BROWSER_SSL_BLOCKING_PAGE_H_
+#endif  // CHROME_BROWSER_SSL_SSL_BLOCKING_PAGE_H_
diff --git a/chrome/browser/ssl/ssl_client_auth_handler.h b/chrome/browser/ssl/ssl_client_auth_handler.h
index 6d7550d..0a07d79 100644
--- a/chrome/browser/ssl/ssl_client_auth_handler.h
+++ b/chrome/browser/ssl/ssl_client_auth_handler.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_SSL_SSL_CLIENT_AUTH_HANDLER_H
-#define CHROME_BROWSER_SSL_SSL_CLIENT_AUTH_HANDLER_H
+#ifndef CHROME_BROWSER_SSL_SSL_CLIENT_AUTH_HANDLER_H_
+#define CHROME_BROWSER_SSL_SSL_CLIENT_AUTH_HANDLER_H_
 
 #include "base/basictypes.h"
 #include "base/ref_counted.h"
@@ -18,8 +18,8 @@ class URLRequest;
 // authentication by the user.
 // It is self-owned and deletes itself when the UI reports the user selection or
 // when the URLRequest is cancelled.
-class SSLClientAuthHandler :
-    public base::RefCountedThreadSafe<SSLClientAuthHandler> {
+class SSLClientAuthHandler
+    : public base::RefCountedThreadSafe<SSLClientAuthHandler> {
  public:
   SSLClientAuthHandler(URLRequest* request,
                        net::SSLCertRequestInfo* cert_request_info);
@@ -55,4 +55,4 @@ class SSLClientAuthHandler :
   DISALLOW_COPY_AND_ASSIGN(SSLClientAuthHandler);
 };
 
-#endif  // CHROME_BROWSER_SSL_SSL_CLIENT_AUTH_HANDLER_H
+#endif  // CHROME_BROWSER_SSL_SSL_CLIENT_AUTH_HANDLER_H_
diff --git a/chrome/browser/status_bubble.h b/chrome/browser/status_bubble.h
index faefdcd..9203b80 100644
--- a/chrome/browser/status_bubble.h
+++ b/chrome/browser/status_bubble.h
@@ -46,4 +46,4 @@ class StatusBubble {
   virtual void UpdateDownloadShelfVisibility(bool visible) = 0;
 };
 
-#endif  // #ifndef CHROME_BROWSER_STATUS_BUBBLE_H_
+#endif  // CHROME_BROWSER_STATUS_BUBBLE_H_
diff --git a/chrome/browser/strict_transport_security_persister.h b/chrome/browser/strict_transport_security_persister.h
index 9b6c9ca..321bbe1 100644
--- a/chrome/browser/strict_transport_security_persister.h
+++ b/chrome/browser/strict_transport_security_persister.h
@@ -30,15 +30,17 @@
 //   copies the current state of the StrictTransportSecurityState, serialises
 //   and writes to disk.
 
+#ifndef CHROME_BROWSER_STRICT_TRANSPORT_SECURITY_PERSISTER_H_
+#define CHROME_BROWSER_STRICT_TRANSPORT_SECURITY_PERSISTER_H_
+
 #include "base/file_path.h"
 #include "base/lock.h"
 #include "base/ref_counted.h"
 #include "net/base/strict_transport_security_state.h"
 
-
-class StrictTransportSecurityPersister :
-    public base::RefCountedThreadSafe<StrictTransportSecurityPersister>,
-    public net::StrictTransportSecurityState::Delegate {
+class StrictTransportSecurityPersister
+    : public base::RefCountedThreadSafe<StrictTransportSecurityPersister>,
+      public net::StrictTransportSecurityState::Delegate {
  public:
   StrictTransportSecurityPersister(net::StrictTransportSecurityState* state,
                                    const FilePath& profile_path);
@@ -68,3 +70,5 @@ class StrictTransportSecurityPersister :
   // The path to the file in which we store the serialised state.
   const FilePath state_file_;
 };
+
+#endif  // CHROME_BROWSER_STRICT_TRANSPORT_SECURITY_PERSISTER_H_
diff --git a/chrome/browser/sync/engine/conflict_resolver.h b/chrome/browser/sync/engine/conflict_resolver.h
index eb12210..3ba0db1 100644
--- a/chrome/browser/sync/engine/conflict_resolver.h
+++ b/chrome/browser/sync/engine/conflict_resolver.h
@@ -126,4 +126,4 @@ class ConflictResolver {
 
 }  // namespace browser_sync
 
-#endif // CHROME_BROWSER_SYNC_ENGINE_CONFLICT_RESOLVER_H_
+#endif  // CHROME_BROWSER_SYNC_ENGINE_CONFLICT_RESOLVER_H_
diff --git a/chrome/browser/sync/engine/net/gaia_authenticator.h b/chrome/browser/sync/engine/net/gaia_authenticator.h
index 264e499..0f818c1 100644
--- a/chrome/browser/sync/engine/net/gaia_authenticator.h
+++ b/chrome/browser/sync/engine/net/gaia_authenticator.h
@@ -153,8 +153,8 @@ class GaiaAuthenticator {
     std::string captcha_url;
     SignIn signin;
 
-    AuthResults () : credentials_saved(DONT_SAVE_CREDENTIALS),
-                     auth_error(None) { }
+    AuthResults() : credentials_saved(DONT_SAVE_CREDENTIALS),
+                    auth_error(None) { }
   };
 
  protected:
diff --git a/chrome/browser/sync/engine/net/syncapi_server_connection_manager.h b/chrome/browser/sync/engine/net/syncapi_server_connection_manager.h
index 84a355e..4758d25 100644
--- a/chrome/browser/sync/engine/net/syncapi_server_connection_manager.h
+++ b/chrome/browser/sync/engine/net/syncapi_server_connection_manager.h
@@ -15,8 +15,8 @@ class HttpPostProviderFactory;
 
 // This provides HTTP Post functionality through the interface provided
 // to the sync API by the application hosting the syncer backend.
-class SyncAPIBridgedPost :
-    public browser_sync::ServerConnectionManager::Post {
+class SyncAPIBridgedPost
+    : public browser_sync::ServerConnectionManager::Post {
  public:
   SyncAPIBridgedPost(browser_sync::ServerConnectionManager* scm,
                      HttpPostProviderFactory* factory)
@@ -41,8 +41,8 @@ class SyncAPIBridgedPost :
 // A ServerConnectionManager subclass used by the syncapi layer. We use a
 // subclass so that we can override MakePost() to generate a POST object using
 // an instance of the HttpPostProviderFactory class.
-class SyncAPIServerConnectionManager :
-    public browser_sync::ServerConnectionManager {
+class SyncAPIServerConnectionManager
+    : public browser_sync::ServerConnectionManager {
  public:
   SyncAPIServerConnectionManager(const std::string& server,
                                  int port,
diff --git a/chrome/browser/sync/engine/syncer_thread.h b/chrome/browser/sync/engine/syncer_thread.h
index f0287d4..84abfdd 100644
--- a/chrome/browser/sync/engine/syncer_thread.h
+++ b/chrome/browser/sync/engine/syncer_thread.h
@@ -74,7 +74,7 @@ class SyncerThread : public base::RefCountedThreadSafe<SyncerThread> {
   FRIEND_TEST(SyncerThreadWithSyncerTest, Throttling);
   friend class SyncerThreadWithSyncerTest;
   friend class SyncerThreadFactory;
-public:
+ public:
   // Encapsulates the parameters that make up an interval on which the
   // syncer thread is sleeping.
   struct WaitInterval {
diff --git a/chrome/browser/sync/glue/change_processor.h b/chrome/browser/sync/glue/change_processor.h
index 55c0c66..fe7719b 100644
--- a/chrome/browser/sync/glue/change_processor.h
+++ b/chrome/browser/sync/glue/change_processor.h
@@ -23,7 +23,7 @@ class UnrecoverableErrorHandler;
 class ChangeProcessor : public BookmarkModelObserver,
                         public ChangeProcessingInterface {
  public:
-  ChangeProcessor(UnrecoverableErrorHandler* error_handler)
+  explicit ChangeProcessor(UnrecoverableErrorHandler* error_handler)
       : running_(false), error_handler_(error_handler),
         bookmark_model_(NULL), share_handle_(NULL), model_associator_(NULL) {}
   virtual ~ChangeProcessor() { Stop(); }
@@ -181,4 +181,4 @@ class ChangeProcessor : public BookmarkModelObserver,
 
 }  // namespace browser_sync
 
-#endif  // CHROME_BROWSER_SYNC_GLUE_CHANGE_APPLICATOR_H_
+#endif  // CHROME_BROWSER_SYNC_GLUE_CHANGE_PROCESSOR_H_
diff --git a/chrome/browser/sync/glue/http_bridge.h b/chrome/browser/sync/glue/http_bridge.h
index 9f08540..9ac5af8 100644
--- a/chrome/browser/sync/glue/http_bridge.h
+++ b/chrome/browser/sync/glue/http_bridge.h
@@ -98,7 +98,7 @@ class HttpBridge : public base::RefCountedThreadSafe<HttpBridge>,
     DISALLOW_COPY_AND_ASSIGN(RequestContextGetter);
   };
 
-  HttpBridge(RequestContextGetter* context);
+  explicit HttpBridge(RequestContextGetter* context);
 
   // sync_api::HttpPostProvider implementation.
   virtual void SetUserAgent(const char* user_agent);
diff --git a/chrome/browser/sync/notifier/base/fastalloc.h b/chrome/browser/sync/notifier/base/fastalloc.h
index 244a1f8..ac0fb46 100644
--- a/chrome/browser/sync/notifier/base/fastalloc.h
+++ b/chrome/browser/sync/notifier/base/fastalloc.h
@@ -12,7 +12,7 @@ namespace notifier {
 template<class T, size_t Size>
 class FastAlloc {
  public:
-  FastAlloc() : buffer_(NULL), size_(0) { };
+  FastAlloc() : buffer_(NULL), size_(0) { }
   ~FastAlloc() { freeBuffer(); }
   T* get_buffer(size_t size) {
     if (size_ != 0) {
diff --git a/chrome/browser/sync/notifier/base/static_assert.h b/chrome/browser/sync/notifier/base/static_assert.h
index 78e6ac3..12dba44 100644
--- a/chrome/browser/sync/notifier/base/static_assert.h
+++ b/chrome/browser/sync/notifier/base/static_assert.h
@@ -5,9 +5,11 @@
 #ifndef CHROME_BROWSER_SYNC_NOTIFIER_BASE_STATIC_ASSERT_H_
 #define CHROME_BROWSER_SYNC_NOTIFIER_BASE_STATIC_ASSERT_H_
 
-template <bool> struct STATIC_ASSERTION_FAILURE;
+template<bool> struct STATIC_ASSERTION_FAILURE;
 
-template <> struct STATIC_ASSERTION_FAILURE<true> { enum { value = 1 }; };
+template<> struct STATIC_ASSERTION_FAILURE<true> {
+  enum { value = 1 };
+};
 
 template<int> struct static_assert_test{};
 
diff --git a/chrome/browser/sync/notifier/communicator/login_failure.h b/chrome/browser/sync/notifier/communicator/login_failure.h
index 1f2a9a6..21d7d36 100644
--- a/chrome/browser/sync/notifier/communicator/login_failure.h
+++ b/chrome/browser/sync/notifier/communicator/login_failure.h
@@ -28,7 +28,7 @@ class LoginFailure {
     PROXY_AUTHENTICATION_ERROR,
   };
 
-  LoginFailure(LoginError error);
+  explicit LoginFailure(LoginError error);
   LoginFailure(LoginError error,
                buzz::XmppEngine::Error xmpp_error,
                int subcode);
diff --git a/chrome/browser/sync/syncable/syncable.cc b/chrome/browser/sync/syncable/syncable.cc
index 0ba9dab..af2cf28 100644
--- a/chrome/browser/sync/syncable/syncable.cc
+++ b/chrome/browser/sync/syncable/syncable.cc
@@ -75,7 +75,7 @@ int64 Now() {
   LARGE_INTEGER n;
   memcpy(&n, &filetime, sizeof(filetime));
   return n.QuadPart;
-#elif (defined(OS_LINUX) || defined(OS_MACOSX))
+#elif defined(OS_LINUX) || defined(OS_MACOSX)
   struct timeval tv;
   gettimeofday(&tv, NULL);
   return static_cast<int64>(tv.tv_sec);
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_;
diff --git a/chrome/browser/views/about_chrome_view.cc b/chrome/browser/views/about_chrome_view.cc
index 25da360..e738067 100755
--- a/chrome/browser/views/about_chrome_view.cc
+++ b/chrome/browser/views/about_chrome_view.cc
@@ -250,8 +250,10 @@ void AboutChromeView::Init() {
   // Add up the height of the various elements on the page.
   int height = about_background_logo->height() +
                kRelatedControlVerticalSpacing +
-               font.height() +                // Copyright line.
-               dummy_text.GetHeightForWidth(  // Main label.
+               // Copyright line.
+               font.height() +
+               // Main label.
+               dummy_text.GetHeightForWidth(
                    dialog_dimensions_.width() - (2 * kPanelHorizMargin)) +
                kRelatedControlVerticalSpacing;
 
diff --git a/chrome/browser/views/about_network_dialog.cc b/chrome/browser/views/about_network_dialog.cc
index 65adf01..128b2c8 100644
--- a/chrome/browser/views/about_network_dialog.cc
+++ b/chrome/browser/views/about_network_dialog.cc
@@ -310,7 +310,7 @@ void AboutNetworkDialog::SetupControls() {
   //
   // This raises the maximum number of chars from 32K to some large maximum,
   // probably 2GB. 32K is not nearly enough for our use-case.
-  //SendMessageW(text_field_->GetNativeComponent(), EM_SETLIMITTEXT, 0, 0);
+  // SendMessageW(text_field_->GetNativeComponent(), EM_SETLIMITTEXT, 0, 0);
 
   static const int first_column_set = 1;
   views::ColumnSet* column_set = layout->AddColumnSet(first_column_set);
diff --git a/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h b/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h
index 2f991bc..3104fd7 100644
--- a/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h
+++ b/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h
@@ -137,5 +137,4 @@ class AutocompletePopupContentsView : public views::View,
   DISALLOW_COPY_AND_ASSIGN(AutocompletePopupContentsView);
 };
 
-
-#endif  // #ifndef CHROME_BROWSER_VIEWS_AUTOCOMPLETE_AUTOCOMPLETE_POPUP_CONTENTS_VIEW_H_
+#endif  // CHROME_BROWSER_VIEWS_AUTOCOMPLETE_AUTOCOMPLETE_POPUP_CONTENTS_VIEW_H_
diff --git a/chrome/browser/views/autocomplete/autocomplete_popup_gtk.h b/chrome/browser/views/autocomplete/autocomplete_popup_gtk.h
index b2c680b..5c9ee46 100644
--- a/chrome/browser/views/autocomplete/autocomplete_popup_gtk.h
+++ b/chrome/browser/views/autocomplete/autocomplete_popup_gtk.h
@@ -21,4 +21,4 @@ class AutocompletePopupGtk : public views::WidgetGtk {
   DISALLOW_COPY_AND_ASSIGN(AutocompletePopupGtk);
 };
 
-#endif  // #ifndef CHROME_BROWSER_VIEWS_AUTOCOMPLETE_AUTOCOMPLETE_POPUP_GTK_H_
+#endif  // CHROME_BROWSER_VIEWS_AUTOCOMPLETE_AUTOCOMPLETE_POPUP_GTK_H_
diff --git a/chrome/browser/views/autocomplete/autocomplete_popup_win.h b/chrome/browser/views/autocomplete/autocomplete_popup_win.h
index 734938e..cb9e838 100644
--- a/chrome/browser/views/autocomplete/autocomplete_popup_win.h
+++ b/chrome/browser/views/autocomplete/autocomplete_popup_win.h
@@ -26,4 +26,4 @@ class AutocompletePopupWin : public views::WidgetWin {
   DISALLOW_COPY_AND_ASSIGN(AutocompletePopupWin);
 };
 
-#endif  // #ifndef CHROME_BROWSER_VIEWS_AUTOCOMPLETE_AUTOCOMPLETE_POPUP_WIN_H_
+#endif  // CHROME_BROWSER_VIEWS_AUTOCOMPLETE_AUTOCOMPLETE_POPUP_WIN_H_
diff --git a/chrome/browser/views/bookmark_manager_view.h b/chrome/browser/views/bookmark_manager_view.h
index c8de962..1afe28d 100644
--- a/chrome/browser/views/bookmark_manager_view.h
+++ b/chrome/browser/views/bookmark_manager_view.h
@@ -89,8 +89,8 @@ class BookmarkManagerView : public views::View,
   virtual std::wstring GetWindowName() const;
   virtual View* GetContentsView() { return this; }
   // TODO(sky): implement these when we have an icon.
-  //virtual SkBitmap GetWindowIcon();
-  //virtual bool ShouldShowWindowIcon() const { return true; }
+  // virtual SkBitmap GetWindowIcon();
+  // virtual bool ShouldShowWindowIcon() const { return true; }
   virtual void WindowClosing();
 
   // ProfileSyncServiceObserver method.
diff --git a/chrome/browser/views/browser_actions_container.h b/chrome/browser/views/browser_actions_container.h
index f133515..4e3f53b 100644
--- a/chrome/browser/views/browser_actions_container.h
+++ b/chrome/browser/views/browser_actions_container.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_VIEWS_BROWSER_ACTIONS_PANEL_H_
-#define CHROME_BROWSER_VIEWS_BROWSER_ACTIONS_PANEL_H_
+#ifndef CHROME_BROWSER_VIEWS_BROWSER_ACTIONS_CONTAINER_H_
+#define CHROME_BROWSER_VIEWS_BROWSER_ACTIONS_CONTAINER_H_
 
 #include <vector>
 
@@ -227,4 +227,4 @@ class BrowserActionsContainer : public views::View,
   DISALLOW_COPY_AND_ASSIGN(BrowserActionsContainer);
 };
 
-#endif  // CHROME_BROWSER_VIEWS_BROWSER_ACTIONS_PANEL_H_
+#endif  // CHROME_BROWSER_VIEWS_BROWSER_ACTIONS_CONTAINER_H_
diff --git a/chrome/browser/views/browser_bubble.h b/chrome/browser/views/browser_bubble.h
index 36accbd..74928f3 100644
--- a/chrome/browser/views/browser_bubble.h
+++ b/chrome/browser/views/browser_bubble.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_VIEWS_BROWSER_BUBBLE_
-#define CHROME_BROWSER_VIEWS_BROWSER_BUBBLE_
+#ifndef CHROME_BROWSER_VIEWS_BROWSER_BUBBLE_H_
+#define CHROME_BROWSER_VIEWS_BROWSER_BUBBLE_H_
 
 #include "views/view.h"
 #include "views/widget/widget.h"
@@ -114,4 +114,4 @@ class BrowserBubble {
   DISALLOW_COPY_AND_ASSIGN(BrowserBubble);
 };
 
-#endif  // CHROME_BROWSER_VIEWS_BROWSER_BUBBLE_
+#endif  // CHROME_BROWSER_VIEWS_BROWSER_BUBBLE_H_
diff --git a/chrome/browser/views/browser_bubble_win.cc b/chrome/browser/views/browser_bubble_win.cc
index f1a27b7..d25fea3 100644
--- a/chrome/browser/views/browser_bubble_win.cc
+++ b/chrome/browser/views/browser_bubble_win.cc
@@ -10,9 +10,8 @@
 #include "views/widget/widget_win.h"
 #include "views/window/window.h"
 
-class BubbleWidget : public views::WidgetWin
-{
-public:
+class BubbleWidget : public views::WidgetWin {
+ public:
   explicit BubbleWidget(BrowserBubble* bubble)
       : bubble_(bubble), closed_(false) {
   }
@@ -62,7 +61,7 @@ public:
     }
   }
 
-private:
+ private:
   bool closed_;
   BrowserBubble* bubble_;
 };
diff --git a/chrome/browser/views/bubble_border.cc b/chrome/browser/views/bubble_border.cc
index 3c18983..fd964be 100644
--- a/chrome/browser/views/bubble_border.cc
+++ b/chrome/browser/views/bubble_border.cc
@@ -23,7 +23,7 @@ SkBitmap* BubbleBorder::bottom_left_ = NULL;
 SkBitmap* BubbleBorder::top_arrow_ = NULL;
 SkBitmap* BubbleBorder::bottom_arrow_ = NULL;
 
-//static
+// static
 int BubbleBorder::arrow_x_offset_;
 
 // The height inside the arrow image, in pixels.
diff --git a/chrome/browser/views/bubble_border.h b/chrome/browser/views/bubble_border.h
index f7af358..3b48048 100644
--- a/chrome/browser/views/bubble_border.h
+++ b/chrome/browser/views/bubble_border.h
@@ -104,16 +104,16 @@ class BubbleBorder : public views::Border {
 // A Background that clips itself to the specified BubbleBorder and uses
 // the background color of the BubbleBorder.
 class BubbleBackground : public views::Background {
-public:
-  BubbleBackground(BubbleBorder* border) : border_(border) {}
+ public:
+  explicit BubbleBackground(BubbleBorder* border) : border_(border) {}
 
   // Background overrides.
   virtual void Paint(gfx::Canvas* canvas, views::View* view) const;
 
-private:
+ private:
   BubbleBorder* border_;
 
   DISALLOW_COPY_AND_ASSIGN(BubbleBackground);
 };
 
-#endif  // #ifndef CHROME_BROWSER_VIEWS_BUBBLE_BORDER_H_
+#endif  // CHROME_BROWSER_VIEWS_BUBBLE_BORDER_H_
diff --git a/chrome/browser/views/chrome_views_delegate.h b/chrome/browser/views/chrome_views_delegate.h
index 346fd73..d024112 100644
--- a/chrome/browser/views/chrome_views_delegate.h
+++ b/chrome/browser/views/chrome_views_delegate.h
@@ -30,4 +30,4 @@ class ChromeViewsDelegate : public views::ViewsDelegate {
   DISALLOW_COPY_AND_ASSIGN(ChromeViewsDelegate);
 };
 
-#endif  // #ifndef CHROME_BROWSER_VIEWS_CHROME_VIEWS_DELEGATE_H_
+#endif  // CHROME_BROWSER_VIEWS_CHROME_VIEWS_DELEGATE_H_
diff --git a/chrome/browser/views/constrained_window_win.h b/chrome/browser/views/constrained_window_win.h
index c331322..d51dc8e 100644
--- a/chrome/browser/views/constrained_window_win.h
+++ b/chrome/browser/views/constrained_window_win.h
@@ -71,4 +71,4 @@ class ConstrainedWindowWin : public ConstrainedWindow,
   DISALLOW_COPY_AND_ASSIGN(ConstrainedWindowWin);
 };
 
-#endif  // #ifndef CHROME_BROWSER_VIEWS_CONSTRAINED_WINDOW_WIN_H_
+#endif  // CHROME_BROWSER_VIEWS_CONSTRAINED_WINDOW_WIN_H_
diff --git a/chrome/browser/views/dropdown_bar_view.h b/chrome/browser/views/dropdown_bar_view.h
index 7fcc319..21bd64d 100644
--- a/chrome/browser/views/dropdown_bar_view.h
+++ b/chrome/browser/views/dropdown_bar_view.h
@@ -50,4 +50,4 @@ class DropdownBarView : public views::View {
   DISALLOW_COPY_AND_ASSIGN(DropdownBarView);
 };
 
-#endif  // CHROME_BROWSER_VIEWS_DROPDOW_BAR_VIEW_H_
+#endif  // CHROME_BROWSER_VIEWS_DROPDOWN_BAR_VIEW_H_
diff --git a/chrome/browser/views/extensions/extension_installed_bubble.h b/chrome/browser/views/extensions/extension_installed_bubble.h
index def9fcb..3c9f118 100644
--- a/chrome/browser/views/extensions/extension_installed_bubble.h
+++ b/chrome/browser/views/extensions/extension_installed_bubble.h
@@ -25,10 +25,10 @@ class SkBitmap;
 //                      don't specify a default icon.
 //
 // ExtensionInstallBubble manages its own lifetime.
-class ExtensionInstalledBubble :
-    public InfoBubbleDelegate,
-    public NotificationObserver,
-    public base::RefCountedThreadSafe<ExtensionInstalledBubble> {
+class ExtensionInstalledBubble
+    : public InfoBubbleDelegate,
+      public NotificationObserver,
+      public base::RefCountedThreadSafe<ExtensionInstalledBubble> {
  public:
   // The behavior and content of this InfoBubble comes in three varieties.
   enum BubbleType {
@@ -43,7 +43,7 @@ class ExtensionInstalledBubble :
   // icon of the extension.
   static void Show(Extension *extension, Browser *browser, SkBitmap icon);
 
-private:
+ private:
   friend class base::RefCountedThreadSafe<ExtensionInstalledBubble>;
 
   // Private ctor. Registers a listener for EXTENSION_LOADED.
diff --git a/chrome/browser/views/frame/browser_extender.h b/chrome/browser/views/frame/browser_extender.h
index b33d173..b27423c 100644
--- a/chrome/browser/views/frame/browser_extender.h
+++ b/chrome/browser/views/frame/browser_extender.h
@@ -56,7 +56,7 @@ class BrowserExtender {
   // to use the regular logic to decide.
   virtual bool ShouldForceHideToolbar() = 0;
 
-  // Returns true if the compact navigation bar is focusable and got 
+  // Returns true if the compact navigation bar is focusable and got
   // focus, false otherwise.
   virtual bool SetFocusToCompactNavigationBar() = 0;
 
diff --git a/chrome/browser/views/frame/browser_frame_gtk.h b/chrome/browser/views/frame/browser_frame_gtk.h
index 32d7162..b58377b 100644
--- a/chrome/browser/views/frame/browser_frame_gtk.h
+++ b/chrome/browser/views/frame/browser_frame_gtk.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_VIEWS_FRAME_GTK_BROWSER_FRAME_GTK_H_
-#define CHROME_BROWSER_VIEWS_FRAME_GTK_BROWSER_FRAME_GTK_H_
+#ifndef CHROME_BROWSER_VIEWS_FRAME_BROWSER_FRAME_GTK_H_
+#define CHROME_BROWSER_VIEWS_FRAME_BROWSER_FRAME_GTK_H_
 
 #include "base/basictypes.h"
 #include "chrome/browser/views/frame/browser_frame.h"
@@ -67,4 +67,4 @@ class BrowserFrameGtk : public BrowserFrame,
   DISALLOW_COPY_AND_ASSIGN(BrowserFrameGtk);
 };
 
-#endif  // CHROME_BROWSER_VIEWS_FRAME_GTK_BROWSER_FRAME_GTK_H_
+#endif  // CHROME_BROWSER_VIEWS_FRAME_BROWSER_FRAME_GTK_H_
diff --git a/chrome/browser/views/frame/browser_non_client_frame_view.h b/chrome/browser/views/frame/browser_non_client_frame_view.h
index 04a9bf4..a348b47 100644
--- a/chrome/browser/views/frame/browser_non_client_frame_view.h
+++ b/chrome/browser/views/frame/browser_non_client_frame_view.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_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_
-#define CHROME_BROWSER_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_
+#ifndef CHROME_BROWSER_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_H_
+#define CHROME_BROWSER_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_H_
 
 #include "views/window/non_client_view.h"
 
@@ -23,4 +23,4 @@ class BrowserNonClientFrameView : public views::NonClientFrameView {
   virtual void UpdateThrobber(bool running) = 0;
 };
 
-#endif  // #ifndef CHROME_BROWSER_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_
+#endif  // CHROME_BROWSER_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_H_
diff --git a/chrome/browser/views/frame/browser_root_view.h b/chrome/browser/views/frame/browser_root_view.h
index c2fd672..a3fbd88 100644
--- a/chrome/browser/views/frame/browser_root_view.h
+++ b/chrome/browser/views/frame/browser_root_view.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_VIEWS_FRAME_BROWSER_ROOT_VIEW_H
-#define CHROME_BROWSER_VIEWS_FRAME_BROWSER_ROOT_VIEW_H
+#ifndef CHROME_BROWSER_VIEWS_FRAME_BROWSER_ROOT_VIEW_H_
+#define CHROME_BROWSER_VIEWS_FRAME_BROWSER_ROOT_VIEW_H_
 
 #include "views/widget/root_view.h"
 
@@ -59,4 +59,4 @@ class BrowserRootView : public views::RootView {
   DISALLOW_COPY_AND_ASSIGN(BrowserRootView);
 };
 
-#endif  // CHROME_BROWSER_VIEWS_FRAME_BROWSER_ROOT_VIEW_H
+#endif  // CHROME_BROWSER_VIEWS_FRAME_BROWSER_ROOT_VIEW_H_
diff --git a/chrome/browser/views/frame/glass_browser_frame_view.h b/chrome/browser/views/frame/glass_browser_frame_view.h
index a686f09..6a9194d 100644
--- a/chrome/browser/views/frame/glass_browser_frame_view.h
+++ b/chrome/browser/views/frame/glass_browser_frame_view.h
@@ -104,4 +104,4 @@ class GlassBrowserFrameView : public BrowserNonClientFrameView {
   DISALLOW_EVIL_CONSTRUCTORS(GlassBrowserFrameView);
 };
 
-#endif  // #ifndef CHROME_BROWSER_VIEWS_FRAME_GLASS_BROWSER_FRAME_VIEW_H_
+#endif  // CHROME_BROWSER_VIEWS_FRAME_GLASS_BROWSER_FRAME_VIEW_H_
diff --git a/chrome/browser/views/frame/opaque_browser_frame_view.h b/chrome/browser/views/frame/opaque_browser_frame_view.h
index 857d783..44b7197 100644
--- a/chrome/browser/views/frame/opaque_browser_frame_view.h
+++ b/chrome/browser/views/frame/opaque_browser_frame_view.h
@@ -163,4 +163,4 @@ class OpaqueBrowserFrameView : public BrowserNonClientFrameView,
   DISALLOW_EVIL_CONSTRUCTORS(OpaqueBrowserFrameView);
 };
 
-#endif  // #ifndef CHROME_BROWSER_VIEWS_FRAME_OPAQUE_BROWSER_FRAME_VIEW_H_
+#endif  // CHROME_BROWSER_VIEWS_FRAME_OPAQUE_BROWSER_FRAME_VIEW_H_
diff --git a/chrome/browser/views/info_bubble.h b/chrome/browser/views/info_bubble.h
index 0e7e622..992fafd 100644
--- a/chrome/browser/views/info_bubble.h
+++ b/chrome/browser/views/info_bubble.h
@@ -75,7 +75,7 @@ class InfoBubbleDelegate {
   // Whether the InfoBubble should be closed when the Esc key is pressed.
   virtual bool CloseOnEscape() = 0;
 
-  // Whether the default placement of the anchor is on the origin side of the 
+  // Whether the default placement of the anchor is on the origin side of the
   // text direction. For example: if true (the default) in LTR text direction,
   // the ArrowLocation will be TOP_LEFT, if false it will be TOP_RIGHT.
   // RTL is the reverse.
diff --git a/chrome/browser/views/infobars/infobar_container.h b/chrome/browser/views/infobars/infobar_container.h
index b5ea0f0..c114c5c 100644
--- a/chrome/browser/views/infobars/infobar_container.h
+++ b/chrome/browser/views/infobars/infobar_container.h
@@ -85,4 +85,4 @@ class InfoBarContainer : public views::View,
   DISALLOW_COPY_AND_ASSIGN(InfoBarContainer);
 };
 
-#endif  // #ifndef CHROME_BROWSER_VIEWS_INFOBARS_INFOBAR_CONTAINER_H_
+#endif  // CHROME_BROWSER_VIEWS_INFOBARS_INFOBAR_CONTAINER_H_
diff --git a/chrome/browser/views/infobars/infobars.h b/chrome/browser/views/infobars/infobars.h
index d55baa4..9870ad4 100644
--- a/chrome/browser/views/infobars/infobars.h
+++ b/chrome/browser/views/infobars/infobars.h
@@ -196,4 +196,4 @@ class ConfirmInfoBar : public AlertInfoBar {
 };
 
 
-#endif  // #ifndef CHROME_BROWSER_VIEWS_INFOBARS_INFOBARS_H_
+#endif  // CHROME_BROWSER_VIEWS_INFOBARS_INFOBARS_H_
diff --git a/chrome/browser/views/location_bar_view.h b/chrome/browser/views/location_bar_view.h
index 26d562b..3a57e26 100644
--- a/chrome/browser/views/location_bar_view.h
+++ b/chrome/browser/views/location_bar_view.h
@@ -99,10 +99,10 @@ class LocationBarView : public LocationBar,
   // |page_action|. If |preview_enabled| is true, the view will display the
   // PageActions icon even though it has not been activated by the extension.
   // This is used by the ExtensionInstalledBubble to preview what the icon
-  // will look like for the user upon installation of the extension. 
+  // will look like for the user upon installation of the extension.
   void SetPreviewEnabledPageAction(ExtensionAction *page_action,
                                    bool preview_enabled);
-  
+
   // Retrieves the PageAction View which is associated with |page_action|
   views::View* GetPageActionView(ExtensionAction* page_action);
 
diff --git a/chrome/browser/views/options/advanced_contents_view.h b/chrome/browser/views/options/advanced_contents_view.h
index 4173d95..a2cbfa5 100644
--- a/chrome/browser/views/options/advanced_contents_view.h
+++ b/chrome/browser/views/options/advanced_contents_view.h
@@ -35,4 +35,4 @@ class AdvancedScrollViewContainer : public views::View {
   DISALLOW_EVIL_CONSTRUCTORS(AdvancedScrollViewContainer);
 };
 
-#endif  // #ifndef CHROME_BROWSER_VIEWS_OPTIONS_ADVANCED_CONTENTS_VIEW_H__
+#endif  // CHROME_BROWSER_VIEWS_OPTIONS_ADVANCED_CONTENTS_VIEW_H__
diff --git a/chrome/browser/views/options/options_group_view.h b/chrome/browser/views/options/options_group_view.h
index 6d5505a1..de39226 100644
--- a/chrome/browser/views/options/options_group_view.h
+++ b/chrome/browser/views/options/options_group_view.h
@@ -58,4 +58,4 @@ class OptionsGroupView : public views::View {
   DISALLOW_EVIL_CONSTRUCTORS(OptionsGroupView);
 };
 
-#endif  // #ifndef CHROME_BROWSER_VIEWS_OPTIONS_OPTIONS_GROUP_VIEW_H__
+#endif  // CHROME_BROWSER_VIEWS_OPTIONS_OPTIONS_GROUP_VIEW_H__
diff --git a/chrome/browser/views/options/options_page_view.h b/chrome/browser/views/options/options_page_view.h
index 15c1c34..3c29acf 100644
--- a/chrome/browser/views/options/options_page_view.h
+++ b/chrome/browser/views/options/options_page_view.h
@@ -47,4 +47,4 @@ class OptionsPageView : public views::View,
   DISALLOW_EVIL_CONSTRUCTORS(OptionsPageView);
 };
 
-#endif  // #ifndef CHROME_BROWSER_VIEWS_OPTIONS_OPTIONS_PAGE_VIEW_H__
+#endif  // CHROME_BROWSER_VIEWS_OPTIONS_OPTIONS_PAGE_VIEW_H__
diff --git a/chrome/browser/views/shelf_item_dialog.cc b/chrome/browser/views/shelf_item_dialog.cc
deleted file mode 100644
index e69de29..0000000
--- a/chrome/browser/views/shelf_item_dialog.cc
+++ /dev/null
diff --git a/chrome/browser/views/shelf_item_dialog.h b/chrome/browser/views/shelf_item_dialog.h
deleted file mode 100644
index e69de29..0000000
--- a/chrome/browser/views/shelf_item_dialog.h
+++ /dev/null
diff --git a/chrome/browser/views/shell_dialogs_win.cc b/chrome/browser/views/shell_dialogs_win.cc
index 5c19e48..8cb28a6 100644
--- a/chrome/browser/views/shell_dialogs_win.cc
+++ b/chrome/browser/views/shell_dialogs_win.cc
@@ -329,11 +329,11 @@ void SelectFileDialogImpl::ListenerDestroyed() {
 void SelectFileDialogImpl::ExecuteSelectFile(
     const ExecuteSelectParams& params) {
   std::vector<std::wstring> exts;
-  for (size_t i=0; i<params.file_types.extensions.size(); ++i) {
+  for (size_t i = 0; i < params.file_types.extensions.size(); ++i) {
     const std::vector<std::wstring>& inner_exts =
         params.file_types.extensions[i];
     std::wstring ext_string;
-    for (size_t j=0; j<inner_exts.size(); ++j) {
+    for (size_t j = 0; j < inner_exts.size(); ++j) {
       if (!ext_string.empty())
         ext_string.push_back(L';');
       ext_string.append(L"*.");
@@ -420,8 +420,7 @@ void SelectFileDialogImpl::FileNotSelected(void* params, RunState run_state) {
 int CALLBACK SelectFileDialogImpl::BrowseCallbackProc(HWND window,
                                                       UINT message,
                                                       LPARAM parameter,
-                                                      LPARAM data)
-{
+                                                      LPARAM data) {
   if (message == BFFM_INITIALIZED) {
     // WParam is TRUE since passing a path.
     // data lParam member of the BROWSEINFO structure.
diff --git a/chrome/browser/views/tab_contents/render_view_context_menu_external_win.h b/chrome/browser/views/tab_contents/render_view_context_menu_external_win.h
index 15baa37..6f5e5cb5 100644
--- a/chrome/browser/views/tab_contents/render_view_context_menu_external_win.h
+++ b/chrome/browser/views/tab_contents/render_view_context_menu_external_win.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_TAB_CONTENTS_RENDER_VIEW_CONTEXT_MENU_EXTERNAL_WIN_H_
-#define CHROME_BROWSER_TAB_CONTENTS_RENDER_VIEW_CONTEXT_MENU_EXTERNAL_WIN_H_
+#ifndef CHROME_BROWSER_VIEWS_TAB_CONTENTS_RENDER_VIEW_CONTEXT_MENU_EXTERNAL_WIN_H_
+#define CHROME_BROWSER_VIEWS_TAB_CONTENTS_RENDER_VIEW_CONTEXT_MENU_EXTERNAL_WIN_H_
 
 #include <vector>
 
@@ -34,4 +34,4 @@ class RenderViewContextMenuExternalWin : public RenderViewContextMenuWin {
   std::vector<int> disabled_menu_ids_;
 };
 
-#endif  // CHROME_BROWSER_TAB_CONTENTS_RENDER_VIEW_CONTEXT_MENU_EXTERNAL_WIN_H_
+#endif  // CHROME_BROWSER_VIEWS_TAB_CONTENTS_RENDER_VIEW_CONTEXT_MENU_EXTERNAL_WIN_H_
diff --git a/chrome/browser/views/tab_icon_view.h b/chrome/browser/views/tab_icon_view.h
index d25f4f9..6813e32 100644
--- a/chrome/browser/views/tab_icon_view.h
+++ b/chrome/browser/views/tab_icon_view.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_VIEW_TAB_ICON_VIEW_H_
-#define CHROME_BROWSER_VIEW_TAB_ICON_VIEW_H_
+#ifndef CHROME_BROWSER_VIEWS_TAB_ICON_VIEW_H_
+#define CHROME_BROWSER_VIEWS_TAB_ICON_VIEW_H_
 
 #include "views/view.h"
 
@@ -69,4 +69,4 @@ class TabIconView : public views::View {
   DISALLOW_COPY_AND_ASSIGN(TabIconView);
 };
 
-#endif  // CHROME_BROWSER_VIEW_TAB_ICON_VIEW_H_
+#endif  // CHROME_BROWSER_VIEWS_TAB_ICON_VIEW_H_
diff --git a/chrome/browser/views/tabs/browser_tab_strip.h b/chrome/browser/views/tabs/browser_tab_strip.h
index 5ed7353..69b5852 100644
--- a/chrome/browser/views/tabs/browser_tab_strip.h
+++ b/chrome/browser/views/tabs/browser_tab_strip.h
@@ -79,4 +79,4 @@ class BrowserTabStrip : public TabStrip2Model,
   DISALLOW_COPY_AND_ASSIGN(BrowserTabStrip);
 };
 
-#endif  // #ifndef CHROME_BROWSER_VIEWS_TABS_BROWSER_TAB_STRIP_H_
+#endif  // CHROME_BROWSER_VIEWS_TABS_BROWSER_TAB_STRIP_H_
diff --git a/chrome/browser/views/tabs/dragged_tab_controller.h b/chrome/browser/views/tabs/dragged_tab_controller.h
index d4e33c5..c609db6 100644
--- a/chrome/browser/views/tabs/dragged_tab_controller.h
+++ b/chrome/browser/views/tabs/dragged_tab_controller.h
@@ -39,7 +39,7 @@ class TabStripModel;
 ///////////////////////////////////////////////////////////////////////////////
 class DraggedTabController : public TabContentsDelegate,
                              public NotificationObserver,
-                             public MessageLoopForUI::Observer{
+                             public MessageLoopForUI::Observer {
  public:
   DraggedTabController(Tab* source_tab, TabStrip* source_tabstrip);
   virtual ~DraggedTabController();
diff --git a/chrome/browser/views/tabs/grid.cc b/chrome/browser/views/tabs/grid.cc
index fae3ff7..4924956 100644
--- a/chrome/browser/views/tabs/grid.cc
+++ b/chrome/browser/views/tabs/grid.cc
@@ -8,7 +8,7 @@
 
 using views::View;
 
-//static
+// static
 const int Grid::kCellXPadding = 15;
 // static
 const int Grid::kCellYPadding = 15;
diff --git a/chrome/browser/views/tabs/native_view_photobooth.h b/chrome/browser/views/tabs/native_view_photobooth.h
index 913cb0d..0aa930a 100644
--- a/chrome/browser/views/tabs/native_view_photobooth.h
+++ b/chrome/browser/views/tabs/native_view_photobooth.h
@@ -40,4 +40,4 @@ class NativeViewPhotobooth {
                                          const gfx::Rect& target_bounds) = 0;
 };
 
-#endif  // #ifndef CHROME_BROWSER_VIEWS_TABS_NATIVE_VIEW_PHOTOBOOTH_H_
+#endif  // CHROME_BROWSER_VIEWS_TABS_NATIVE_VIEW_PHOTOBOOTH_H_
diff --git a/chrome/browser/views/tabs/native_view_photobooth_gtk.h b/chrome/browser/views/tabs/native_view_photobooth_gtk.h
index 6082f52..791b8c5 100644
--- a/chrome/browser/views/tabs/native_view_photobooth_gtk.h
+++ b/chrome/browser/views/tabs/native_view_photobooth_gtk.h
@@ -26,4 +26,4 @@ class NativeViewPhotoboothGtk : public NativeViewPhotobooth {
   DISALLOW_COPY_AND_ASSIGN(NativeViewPhotoboothGtk);
 };
 
-#endif  // #ifndef CHROME_BROWSER_VIEWS_TABS_NATIVE_VIEW_PHOTOBOOTH_GTK_H_
+#endif  // CHROME_BROWSER_VIEWS_TABS_NATIVE_VIEW_PHOTOBOOTH_GTK_H_
diff --git a/chrome/browser/views/tabs/native_view_photobooth_win.h b/chrome/browser/views/tabs/native_view_photobooth_win.h
index 6429380..fd59afa 100644
--- a/chrome/browser/views/tabs/native_view_photobooth_win.h
+++ b/chrome/browser/views/tabs/native_view_photobooth_win.h
@@ -54,4 +54,4 @@ class NativeViewPhotoboothWin : public NativeViewPhotobooth {
   DISALLOW_COPY_AND_ASSIGN(NativeViewPhotoboothWin);
 };
 
-#endif  // #ifndef CHROME_BROWSER_VIEWS_TABS_NATIVE_VIEW_PHOTOBOOTH_WIN_H_
+#endif  // CHROME_BROWSER_VIEWS_TABS_NATIVE_VIEW_PHOTOBOOTH_WIN_H_
diff --git a/chrome/browser/views/tabs/tab_2.h b/chrome/browser/views/tabs/tab_2.h
index 079d39c..58e5909 100644
--- a/chrome/browser/views/tabs/tab_2.h
+++ b/chrome/browser/views/tabs/tab_2.h
@@ -245,4 +245,4 @@ class Tab2 : public views::View,
   DISALLOW_COPY_AND_ASSIGN(Tab2);
 };
 
-#endif  // #ifndef CHROME_BROWSER_VIEWS_TABS_TAB_2_H_
+#endif  // CHROME_BROWSER_VIEWS_TABS_TAB_2_H_
diff --git a/chrome/browser/views/tabs/tab_overview_types.h b/chrome/browser/views/tabs/tab_overview_types.h
index b70a89d..a2b41be 100644
--- a/chrome/browser/views/tabs/tab_overview_types.h
+++ b/chrome/browser/views/tabs/tab_overview_types.h
@@ -147,7 +147,7 @@ class TabOverviewTypes {
     Message() {
       Init(UNKNOWN);
     }
-    Message(Type type) {
+    explicit Message(Type type) {
       Init(type);
     }
 
diff --git a/chrome/browser/views/tabs/tab_strip.cc b/chrome/browser/views/tabs/tab_strip.cc
index eef7b01..35328af 100644
--- a/chrome/browser/views/tabs/tab_strip.cc
+++ b/chrome/browser/views/tabs/tab_strip.cc
@@ -723,7 +723,7 @@ TabStrip::TabStrip(TabStripModel* model)
 
 TabStrip::~TabStrip() {
   // TODO(beng): (1031854) Restore this line once XPFrame/VistaFrame are dead.
-  //model_->RemoveObserver(this);
+  // model_->RemoveObserver(this);
 
   // TODO(beng): remove this if it doesn't work to fix the TabSelectedAt bug.
   drag_controller_.reset(NULL);
diff --git a/chrome/browser/views/tabs/tab_strip_2.cc b/chrome/browser/views/tabs/tab_strip_2.cc
index 626a78d..e19a31b 100644
--- a/chrome/browser/views/tabs/tab_strip_2.cc
+++ b/chrome/browser/views/tabs/tab_strip_2.cc
@@ -190,7 +190,7 @@ void TabStrip2::DetachDragEnded() {
       gfx::Point screen_point = views::Screen::GetCursorScreenPoint();
       gfx::Rect tsb = GetDraggedTabScreenBounds(screen_point);
       // TODO(beng): figure this one out.
-      //drop_tabstrip_->AttachTab(tabstrip->DetachTab(0), screen_point, tsb);
+      // drop_tabstrip_->AttachTab(tabstrip->DetachTab(0), screen_point, tsb);
     } else {
       GetWindow()->SetUseDragFrame(detached_drag_mode_);
       SendDraggedTabHome();
diff --git a/chrome/browser/views/tabs/tab_strip_2.h b/chrome/browser/views/tabs/tab_strip_2.h
index dc61569..02f016e 100644
--- a/chrome/browser/views/tabs/tab_strip_2.h
+++ b/chrome/browser/views/tabs/tab_strip_2.h
@@ -199,4 +199,4 @@ class TabStrip2 : public views::View,
   DISALLOW_COPY_AND_ASSIGN(TabStrip2);
 };
 
-#endif  // #ifndef CHROME_BROWSER_VIEWS_TABS_TAB_STRIP_2_H_
+#endif  // CHROME_BROWSER_VIEWS_TABS_TAB_STRIP_2_H_
diff --git a/chrome/browser/views/theme_helpers.h b/chrome/browser/views/theme_helpers.h
index 6dad30c..02107e2 100644
--- a/chrome/browser/views/theme_helpers.h
+++ b/chrome/browser/views/theme_helpers.h
@@ -26,4 +26,4 @@ void GetRebarGradientColors(int width, int x1, int x2,
 // Gets the color used to draw dark (inset beveled) lines.
 void GetDarkLineColor(SkColor* dark_color);
 
-#endif  // #ifndef CHROME_BROWSER_VIEWS_THEME_HELPERS_H__
+#endif  // CHROME_BROWSER_VIEWS_THEME_HELPERS_H__
diff --git a/chrome/browser/views/uninstall_view.h b/chrome/browser/views/uninstall_view.h
index 54e6790..9782da4 100644
--- a/chrome/browser/views/uninstall_view.h
+++ b/chrome/browser/views/uninstall_view.h
@@ -57,4 +57,4 @@ class UninstallView : public views::View,
   DISALLOW_COPY_AND_ASSIGN(UninstallView);
 };
 
-#endif  // CHROME_BROWSER_VIEWS_UNINSTALL_VIEW_H_
-\ No newline at end of file
+#endif  // CHROME_BROWSER_VIEWS_UNINSTALL_VIEW_H_
diff --git a/chrome/browser/views/user_data_dir_dialog.h b/chrome/browser/views/user_data_dir_dialog.h
index a4421d9..5634e96 100644
--- a/chrome/browser/views/user_data_dir_dialog.h
+++ b/chrome/browser/views/user_data_dir_dialog.h
@@ -5,8 +5,8 @@
 // A dialog box that tells the user that we can't write to the specified user
 // data directory.  Provides the user a chance to pick a different directory.
 
-#ifndef CHROME_BROWSER_USER_DATA_DIR_DIALOG_H__
-#define CHROME_BROWSER_USER_DATA_DIR_DIALOG_H__
+#ifndef CHROME_BROWSER_VIEWS_USER_DATA_DIR_DIALOG_H_
+#define CHROME_BROWSER_VIEWS_USER_DATA_DIR_DIALOG_H_
 
 #include "base/basictypes.h"
 #include "base/message_loop.h"
@@ -68,4 +68,4 @@ class UserDataDirDialog : public views::DialogDelegate,
   DISALLOW_COPY_AND_ASSIGN(UserDataDirDialog);
 };
 
-#endif // CHROME_BROWSER_USER_DATA_DIR_DIALOG_H__
+#endif  // CHROME_BROWSER_VIEWS_USER_DATA_DIR_DIALOG_H_
diff --git a/chrome/browser/visitedlink_event_listener.h b/chrome/browser/visitedlink_event_listener.h
index 7d51d1e..7c4eda3 100644
--- a/chrome/browser/visitedlink_event_listener.h
+++ b/chrome/browser/visitedlink_event_listener.h
@@ -6,8 +6,8 @@
 // processes. It also coalesces the updates to avoid excessive broadcasting of
 // messages to the renderers.
 
-#ifndef VISITEDLINK_EVENT_LISTENER_H_
-#define VISITEDLINK_EVENT_LISTENER_H_
+#ifndef CHROME_BROWSER_VISITEDLINK_EVENT_LISTENER_H_
+#define CHROME_BROWSER_VISITEDLINK_EVENT_LISTENER_H_
 
 #include "base/timer.h"
 #include "chrome/browser/visitedlink_master.h"
@@ -34,4 +34,4 @@ class VisitedLinkEventListener : public VisitedLinkMaster::Listener {
   DISALLOW_COPY_AND_ASSIGN(VisitedLinkEventListener);
 };
 
-#endif  // VISITEDLINK_EVENT_LISTENER_H_
+#endif  // CHROME_BROWSER_VISITEDLINK_EVENT_LISTENER_H_
diff --git a/chrome/browser/visitedlink_master.h b/chrome/browser/visitedlink_master.h
index b42bedd..a2bc7b9 100644
--- a/chrome/browser/visitedlink_master.h
+++ b/chrome/browser/visitedlink_master.h
@@ -331,7 +331,7 @@ class VisitedLinkMaster : public VisitedLinkCommon {
   // TODO(brettw) Support deletion, we need to track whether anything was
   // deleted during the rebuild here. Then we should delete any of these
   // entries from the complete table later.
-  //std::vector<Fingerprint> removed_since_rebuild_;
+  // std::vector<Fingerprint> removed_since_rebuild_;
 
   // The currently open file with the table in it. This may be NULL if we're
   // rebuilding and haven't written a new version yet. Writing to the file may
@@ -392,4 +392,4 @@ inline void VisitedLinkMaster::DebugValidate() {
 }
 #endif
 
-#endif // CHROME_BROWSER_VISITEDLINK_MASTER_H__
+#endif  // CHROME_BROWSER_VISITEDLINK_MASTER_H__
diff --git a/chrome/browser/web_resource/web_resource_service.cc b/chrome/browser/web_resource/web_resource_service.cc
index a3e4ae4..c26c8b1 100644
--- a/chrome/browser/web_resource/web_resource_service.cc
+++ b/chrome/browser/web_resource/web_resource_service.cc
@@ -198,10 +198,10 @@ const wchar_t* WebResourceService::kDefaultResourceServer =
 const char* WebResourceService::kResourceDirectoryName =
     "Resources";
 
-WebResourceService::WebResourceService(Profile* profile) :
-    prefs_(profile->GetPrefs()),
-    web_resource_dir_(profile->GetPath().AppendASCII(kResourceDirectoryName)),
-    in_fetch_(false) {
+WebResourceService::WebResourceService(Profile* profile)
+    : prefs_(profile->GetPrefs()),
+      web_resource_dir_(profile->GetPath().AppendASCII(kResourceDirectoryName)),
+      in_fetch_(false) {
   Init();
 }
 
diff --git a/chrome/browser/web_resource/web_resource_service.h b/chrome/browser/web_resource/web_resource_service.h
index 8a0289e..86abf1a 100644
--- a/chrome/browser/web_resource/web_resource_service.h
+++ b/chrome/browser/web_resource/web_resource_service.h
@@ -16,7 +16,7 @@ class Profile;
 class WebResourceService
     : public UtilityProcessHost::Client {
  public:
-  WebResourceService(Profile* profile);
+  explicit WebResourceService(Profile* profile);
 
   // Sleep until cache needs to be updated, but always for at least 5 seconds
   // so we don't interfere with startup.  Then begin updating resources.
diff --git a/chrome/browser/worker_host/worker_process_host.h b/chrome/browser/worker_host/worker_process_host.h
index 9946e97..ad4150b 100644
--- a/chrome/browser/worker_host/worker_process_host.h
+++ b/chrome/browser/worker_host/worker_process_host.h
@@ -95,7 +95,7 @@ class WorkerProcessHost : public ChildProcessHost {
     DocumentSet document_set_;
   };
 
-  WorkerProcessHost(ResourceDispatcherHost* resource_dispatcher_host_);
+  explicit WorkerProcessHost(ResourceDispatcherHost* resource_dispatcher_host_);
   ~WorkerProcessHost();
 
   // Starts the process.  Returns true iff it succeeded.
diff --git a/chrome/common/child_process_host.h b/chrome/common/child_process_host.h
index 6e1725e..a79eaf2 100644
--- a/chrome/common/child_process_host.h
+++ b/chrome/common/child_process_host.h
@@ -54,7 +54,7 @@ class ChildProcessHost : public ResourceDispatcherHost::Receiver,
   class Iterator {
    public:
     Iterator();
-    Iterator(ProcessType type);
+    explicit Iterator(ProcessType type);
     ChildProcessHost* operator->() { return *iterator_; }
     ChildProcessHost* operator*() { return *iterator_; }
     ChildProcessHost* operator++();
@@ -105,7 +105,7 @@ class ChildProcessHost : public ResourceDispatcherHost::Receiver,
   // calling the subclass' implementation.
   class ListenerHook : public IPC::Channel::Listener {
    public:
-    ListenerHook(ChildProcessHost* host);
+    explicit ListenerHook(ChildProcessHost* host);
     virtual void OnMessageReceived(const IPC::Message& msg);
     virtual void OnChannelConnected(int32 peer_pid);
     virtual void OnChannelError();
diff --git a/chrome/common/child_thread.h b/chrome/common/child_thread.h
index 9b37e19..2082b08 100644
--- a/chrome/common/child_thread.h
+++ b/chrome/common/child_thread.h
@@ -21,7 +21,7 @@ class ChildThread : public IPC::Channel::Listener,
   // Creates the thread.
   ChildThread();
   // Used for single-process mode.
-  ChildThread(const std::string& channel_name);
+  explicit ChildThread(const std::string& channel_name);
   virtual ~ChildThread();
 
   // IPC::Message::Sender implementation:
diff --git a/chrome/common/chrome_plugin_api.h b/chrome/common/chrome_plugin_api.h
index d30357c..e5230cd 100644
--- a/chrome/common/chrome_plugin_api.h
+++ b/chrome/common/chrome_plugin_api.h
@@ -563,4 +563,4 @@ typedef CPError (STDCALL *CP_InitializeFunc)(
 } // extern "C"
 #endif
 
-#endif // CHROME_COMMON_CHROME_PLUGIN_API_H__
+#endif  // CHROME_COMMON_CHROME_PLUGIN_API_H_
diff --git a/chrome/common/chrome_plugin_lib.h b/chrome/common/chrome_plugin_lib.h
index b2dca62..0193708 100644
--- a/chrome/common/chrome_plugin_lib.h
+++ b/chrome/common/chrome_plugin_lib.h
@@ -65,7 +65,7 @@ class ChromePluginLib : public base::RefCounted<ChromePluginLib>  {
  private:
   friend class base::RefCounted<ChromePluginLib>;
 
-  ChromePluginLib(const FilePath& filename);
+  explicit ChromePluginLib(const FilePath& filename);
   ~ChromePluginLib();
 
   // Method to initialize a Plugin.
diff --git a/chrome/common/chrome_plugin_util.h b/chrome/common/chrome_plugin_util.h
index 2f24243..7714a53 100644
--- a/chrome/common/chrome_plugin_util.h
+++ b/chrome/common/chrome_plugin_util.h
@@ -42,7 +42,7 @@ class PluginHelper : public NotificationObserver, public NonThreadSafe {
  public:
   static void DestroyAllHelpersForPlugin(ChromePluginLib* plugin);
 
-  PluginHelper(ChromePluginLib* plugin);
+  explicit PluginHelper(ChromePluginLib* plugin);
   virtual ~PluginHelper();
 
   // NotificationObserver
@@ -60,7 +60,7 @@ class PluginHelper : public NotificationObserver, public NonThreadSafe {
 
 // A class of utility functions for dealing with request responses.
 class PluginResponseUtils {
-public:
+ public:
   // Helper to convert request load flags from the plugin API to the net API
   // versions.
   static uint32 CPLoadFlagsToNetFlags(uint32 flags);
diff --git a/chrome/common/extensions/extension.cc b/chrome/common/extensions/extension.cc
index 87ab9b6..1a665d4 100644
--- a/chrome/common/extensions/extension.cc
+++ b/chrome/common/extensions/extension.cc
@@ -330,7 +330,7 @@ bool Extension::LoadGlobsHelper(
     int content_script_index,
     const wchar_t* globs_property_name,
     std::string* error,
-    void (UserScript::*add_method) (const std::string& glob),
+    void(UserScript::*add_method)(const std::string& glob),
     UserScript *instance) {
   if (!content_script->HasKey(globs_property_name))
     return true;  // they are optional
diff --git a/chrome/common/extensions/extension.h b/chrome/common/extensions/extension.h
index 24afa3a..8cd5da3 100644
--- a/chrome/common/extensions/extension.h
+++ b/chrome/common/extensions/extension.h
@@ -302,7 +302,7 @@ class Extension {
                        int content_script_index,
                        const wchar_t* globs_property_name,
                        std::string* error,
-                       void (UserScript::*add_method) (const std::string& glob),
+                       void(UserScript::*add_method)(const std::string& glob),
                        UserScript *instance);
 
   // Helper method to load an ExtensionAction from the page_action or
diff --git a/chrome/common/extensions/extension_error_reporter.h b/chrome/common/extensions/extension_error_reporter.h
index aa17205..60d6af3 100644
--- a/chrome/common/extensions/extension_error_reporter.h
+++ b/chrome/common/extensions/extension_error_reporter.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_COMMON_EXTENSIONS_ERROR_REPORTER_H_
-#define CHROME_COMMON_EXTENSIONS_ERROR_REPORTER_H_
+#ifndef CHROME_COMMON_EXTENSIONS_EXTENSION_ERROR_REPORTER_H_
+#define CHROME_COMMON_EXTENSIONS_EXTENSION_ERROR_REPORTER_H_
 
 #include <string>
 #include <vector>
@@ -40,11 +40,11 @@ class ExtensionErrorReporter {
  private:
   static ExtensionErrorReporter* instance_;
 
-  ExtensionErrorReporter(bool enable_noisy_errors);
+  explicit ExtensionErrorReporter(bool enable_noisy_errors);
 
   MessageLoop* ui_loop_;
   std::vector<std::string> errors_;
   bool enable_noisy_errors_;
 };
 
-#endif  // CHROME_COMMON_EXTENSIONS_ERROR_REPORTER_H_
+#endif  // CHROME_COMMON_EXTENSIONS_EXTENSION_ERROR_REPORTER_H_
diff --git a/chrome/common/extensions/extension_error_utils.h b/chrome/common/extensions/extension_error_utils.h
index fdd9b03..54db8ba 100644
--- a/chrome/common/extensions/extension_error_utils.h
+++ b/chrome/common/extensions/extension_error_utils.h
@@ -8,7 +8,7 @@
 #include <string>
 
 class ExtensionErrorUtils {
-public:
+ public:
   // Creates an error messages from a pattern.
   static std::string FormatErrorMessage(const std::string& format,
     const std::string& s1);
diff --git a/chrome/common/gears_api.h b/chrome/common/gears_api.h
index 30f5e2e..9aba014 100644
--- a/chrome/common/gears_api.h
+++ b/chrome/common/gears_api.h
@@ -94,4 +94,4 @@ typedef struct _GearsCreateShortcutResult {
 } // extern "C"
 #endif
 
-#endif // CHROME_COMMON_GEARS_API_H__
+#endif  // CHROME_COMMON_GEARS_API_H_
diff --git a/chrome/common/important_file_writer.h b/chrome/common/important_file_writer.h
index bdf2223..4b70622 100644
--- a/chrome/common/important_file_writer.h
+++ b/chrome/common/important_file_writer.h
@@ -50,7 +50,7 @@ class ImportantFileWriter : public NonThreadSafe {
   // Initialize the writer.
   // |path| is the name of file to write.
   // All non-const methods, ctor and dtor must be called on the same thread.
-  ImportantFileWriter(const FilePath& path);
+  explicit ImportantFileWriter(const FilePath& path);
 
   // You have to ensure that there are no pending writes at the moment
   // of destruction.
diff --git a/chrome/common/json_value_serializer.h b/chrome/common/json_value_serializer.h
index 3dd8f14..1f1e556 100644
--- a/chrome/common/json_value_serializer.h
+++ b/chrome/common/json_value_serializer.h
@@ -16,7 +16,7 @@ class JSONStringValueSerializer : public ValueSerializer {
   // json_string is the string that will be source of the deserialization
   // or the destination of the serialization.  The caller of the constructor
   // retains ownership of the string.
-  JSONStringValueSerializer(std::string* json_string)
+  explicit JSONStringValueSerializer(std::string* json_string)
       : json_string_(json_string),
         initialized_with_const_string_(false),
         pretty_print_(false),
@@ -25,7 +25,7 @@ class JSONStringValueSerializer : public ValueSerializer {
 
   // This version allows initialization with a const string reference for
   // deserialization only.
-  JSONStringValueSerializer(const std::string& json_string)
+  explicit JSONStringValueSerializer(const std::string& json_string)
       : json_string_(&const_cast<std::string&>(json_string)),
         initialized_with_const_string_(true),
         pretty_print_(false),
diff --git a/chrome/common/libxml_utils.cc b/chrome/common/libxml_utils.cc
index c21a363..8b8e39f 100644
--- a/chrome/common/libxml_utils.cc
+++ b/chrome/common/libxml_utils.cc
@@ -117,9 +117,9 @@ bool XmlReader::SkipToElement() {
 
 // XmlWriter functions
 
-XmlWriter::XmlWriter() :
-    writer_(NULL),
-    buffer_(NULL) {}
+XmlWriter::XmlWriter()
+    : writer_(NULL),
+      buffer_(NULL) {}
 
 XmlWriter::~XmlWriter() {
   if (writer_)
diff --git a/chrome/common/logging_chrome.h b/chrome/common/logging_chrome.h
index 434b2fe..f069523 100644
--- a/chrome/common/logging_chrome.h
+++ b/chrome/common/logging_chrome.h
@@ -55,4 +55,4 @@ size_t GetFatalAssertions(AssertionList* assertions);
 
 } // namespace logging
 
-#endif
+#endif  // CHROME_COMMON_LOGGING_CHROME_H_
diff --git a/chrome/common/mru_cache.h b/chrome/common/mru_cache.h
index 9190d9d..b2643f8 100644
--- a/chrome/common/mru_cache.h
+++ b/chrome/common/mru_cache.h
@@ -53,7 +53,7 @@ class MRUCacheBase {
   // a new item is inserted. If the caller wants to manager this itself (for
   // example, maybe it has special work to do when something is evicted), it
   // can pass NO_AUTO_EVICT to not restrict the cache size.
-  MRUCacheBase(size_type max_size) : max_size_(max_size) {
+  explicit MRUCacheBase(size_type max_size) : max_size_(max_size) {
   }
 
   virtual ~MRUCacheBase() {
@@ -205,7 +205,7 @@ class MRUCache : public MRUCacheBase<KeyType,
 
  public:
   // See MRUCacheBase, noting the possibility of using NO_AUTO_EVICT.
-  MRUCache(typename ParentType::size_type max_size)
+  explicit MRUCache(typename ParentType::size_type max_size)
       : ParentType(max_size) {
   }
   virtual ~MRUCache() {
@@ -239,7 +239,7 @@ class OwningMRUCache
 
  public:
   // See MRUCacheBase, noting the possibility of using NO_AUTO_EVICT.
-  OwningMRUCache(typename ParentType::size_type max_size)
+  explicit OwningMRUCache(typename ParentType::size_type max_size)
       : ParentType(max_size) {
   }
   virtual ~OwningMRUCache() {
diff --git a/chrome/common/net/dns.h b/chrome/common/net/dns.h
index 7a3f364..8c91c13 100644
--- a/chrome/common/net/dns.h
+++ b/chrome/common/net/dns.h
@@ -5,9 +5,8 @@
 // This file has shared types used across IPC between render_dns_master.cc
 // and dns_master.cc
 
-
-#ifndef CHROME_COMMON_DNS_H_
-#define CHROME_COMMON_DNS_H_
+#ifndef CHROME_COMMON_NET_DNS_H_
+#define CHROME_COMMON_NET_DNS_H_
 
 #include <string>
 #include <vector>
@@ -21,4 +20,4 @@ namespace chrome_common_net {
 typedef std::vector<std::string> NameList;
 }
 
-#endif  // CHROME_COMMON_DNS_H_
+#endif  // CHROME_COMMON_NET_DNS_H_
diff --git a/chrome/common/net/socket_stream.h b/chrome/common/net/socket_stream.h
index 844328b..6c1ad92 100644
--- a/chrome/common/net/socket_stream.h
+++ b/chrome/common/net/socket_stream.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_COMMON_SOCKET_STREAM_H_
-#define CHROME_COMMON_SOCKET_STREAM_H_
+#ifndef CHROME_COMMON_NET_SOCKET_STREAM_H_
+#define CHROME_COMMON_NET_SOCKET_STREAM_H_
 
 namespace chrome_common_net {
 
@@ -11,4 +11,4 @@ const int kNoSocketId = 0;
 
 }  // namespace chrome_common_net
 
-#endif  // CHROME_COMMON_SOCKET_STREAM_H_
+#endif  // CHROME_COMMON_NET_SOCKET_STREAM_H_
diff --git a/chrome/common/notification_details.h b/chrome/common/notification_details.h
index ee10111..2c914d7 100644
--- a/chrome/common/notification_details.h
+++ b/chrome/common/notification_details.h
@@ -33,7 +33,7 @@ class NotificationDetails {
   }
 
  protected:
-  NotificationDetails(const void* ptr) : ptr_(ptr) {}
+  explicit NotificationDetails(const void* ptr) : ptr_(ptr) {}
 
   // Declaring this const allows Details<T> to be used with both T = Foo and
   // T = const Foo.
@@ -43,8 +43,9 @@ class NotificationDetails {
 template <class T>
 class Details : public NotificationDetails {
  public:
-  Details(T* ptr) : NotificationDetails(ptr) {}
-  Details(const NotificationDetails& other)
+  // TODO(erg): Our code hard relies on implicit conversion
+  Details(T* ptr) : NotificationDetails(ptr) {}  // NOLINT
+  Details(const NotificationDetails& other)      // NOLINT
     : NotificationDetails(other) {}
 
   T* operator->() const { return ptr(); }
diff --git a/chrome/common/notification_source.h b/chrome/common/notification_source.h
index fb37124..98b9f66 100644
--- a/chrome/common/notification_source.h
+++ b/chrome/common/notification_source.h
@@ -31,7 +31,7 @@ class NotificationSource {
   }
 
  protected:
-  NotificationSource(const void* ptr) : ptr_(ptr) {}
+  explicit NotificationSource(const void* ptr) : ptr_(ptr) {}
 
   // Declaring this const allows Source<T> to be used with both T = Foo and
   // T = const Foo.
@@ -41,9 +41,9 @@ class NotificationSource {
 template <class T>
 class Source : public NotificationSource {
  public:
-  Source(T* ptr) : NotificationSource(ptr) {}
-
-  Source(const NotificationSource& other)
+  // TODO(erg): Our code hard relies on implicit conversion
+  Source(T* ptr) : NotificationSource(ptr) {}  // NOLINT
+  Source(const NotificationSource& other)      // NOLINT
     : NotificationSource(other) {}
 
   T* operator->() const { return ptr(); }
diff --git a/chrome/common/notification_type.h b/chrome/common/notification_type.h
index 02514f8..8d4b747 100644
--- a/chrome/common/notification_type.h
+++ b/chrome/common/notification_type.h
@@ -774,7 +774,8 @@ class NotificationType {
     NOTIFICATION_TYPE_COUNT
   };
 
-  NotificationType(Type v) : value(v) {}
+  // TODO(erg): Our notification system relies on implicit conversion.
+  NotificationType(Type v) : value(v) {}  // NOLINT
 
   bool operator==(NotificationType t) const { return value == t.value; }
   bool operator!=(NotificationType t) const { return value != t.value; }
diff --git a/chrome/common/property_bag.h b/chrome/common/property_bag.h
index 602c161..778d0b9 100644
--- a/chrome/common/property_bag.h
+++ b/chrome/common/property_bag.h
@@ -154,7 +154,7 @@ class PropertyAccessor : public PropertyAccessorBase {
  private:
   class Container : public PropertyBag::Prop {
    public:
-    Container(const T& data) : data_(data) {}
+    explicit Container(const T& data) : data_(data) {}
 
     T* get() { return &data_; }
     const T* get() const { return &data_; }
diff --git a/chrome/common/ref_counted_util.h b/chrome/common/ref_counted_util.h
index 801aa42..b04580e 100644
--- a/chrome/common/ref_counted_util.h
+++ b/chrome/common/ref_counted_util.h
@@ -11,11 +11,11 @@
 // RefCountedVector is just a vector wrapped up with
 // RefCountedThreadSafe.
 template<class T>
-class RefCountedVector :
-    public base::RefCountedThreadSafe<RefCountedVector<T> > {
+class RefCountedVector
+    : public base::RefCountedThreadSafe<RefCountedVector<T> > {
  public:
   RefCountedVector() {}
-  RefCountedVector(const std::vector<T>& initializer)
+  explicit RefCountedVector(const std::vector<T>& initializer)
       : data(initializer) {}
 
   std::vector<T> data;
diff --git a/chrome/common/render_messages_internal.h b/chrome/common/render_messages_internal.h
index 03ad8d1..866d9aa 100644
--- a/chrome/common/render_messages_internal.h
+++ b/chrome/common/render_messages_internal.h
@@ -1,4 +1,4 @@
-  // Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
diff --git a/chrome/common/resource_dispatcher.cc b/chrome/common/resource_dispatcher.cc
index a55237d..36c66a9 100644
--- a/chrome/common/resource_dispatcher.cc
+++ b/chrome/common/resource_dispatcher.cc
@@ -20,7 +20,7 @@
 #include "webkit/glue/webkit_glue.h"
 
 // Uncomment to enable logging of request traffic
-//#define LOG_RESOURCE_REQUESTS
+// #define LOG_RESOURCE_REQUESTS
 
 #ifdef LOG_RESOURCE_REQUESTS
 # define RESOURCE_LOG(stuff) LOG(INFO) << stuff
diff --git a/chrome/common/sqlite_compiled_statement.h b/chrome/common/sqlite_compiled_statement.h
index 2ddd81b..01b7f1e 100644
--- a/chrome/common/sqlite_compiled_statement.h
+++ b/chrome/common/sqlite_compiled_statement.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_COMMON_SQLITE_COMPILED_STATEMENT_
-#define CHROME_COMMON_SQLITE_COMPILED_STATEMENT_
+#ifndef CHROME_COMMON_SQLITE_COMPILED_STATEMENT_H_
+#define CHROME_COMMON_SQLITE_COMPILED_STATEMENT_H_
 
 #include <map>
 #include <string>
@@ -132,4 +132,4 @@ class SqliteCompiledStatement {
 #define SQLITE_UNIQUE_STATEMENT(var_name, cache, sql) \
     SqliteCompiledStatement var_name(__FILE__, __LINE__, cache, sql)
 
-#endif  // CHROME_COMMON_SQLITE_COMPILED_STATEMENT_
+#endif  // CHROME_COMMON_SQLITE_COMPILED_STATEMENT_H_
diff --git a/chrome/common/sqlite_utils.h b/chrome/common/sqlite_utils.h
index ece02f1..d5e8df3 100644
--- a/chrome/common/sqlite_utils.h
+++ b/chrome/common/sqlite_utils.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_COMMON_SQLITEUTILS_H_
-#define CHROME_COMMON_SQLITEUTILS_H_
+#ifndef CHROME_COMMON_SQLITE_UTILS_H_
+#define CHROME_COMMON_SQLITE_UTILS_H_
 
 #include <string>
 #include <vector>
@@ -414,4 +414,4 @@ bool DoesSqliteTableHaveRow(sqlite3* db, const char* table_name);
 int sqlite3Preload(sqlite3* db);
 #endif
 
-#endif  // CHROME_COMMON_SQLITEUTILS_H_
+#endif  // CHROME_COMMON_SQLITE_UTILS_H_
diff --git a/chrome/common/temp_scaffolding_stubs.h b/chrome/common/temp_scaffolding_stubs.h
index 8356df2..931a96f 100644
--- a/chrome/common/temp_scaffolding_stubs.h
+++ b/chrome/common/temp_scaffolding_stubs.h
@@ -48,7 +48,7 @@ namespace printing {
 
 class PrintViewManager : public RenderViewHostDelegate::Printing {
  public:
-  PrintViewManager(TabContents& owner) : owner_(owner) { }
+  explicit PrintViewManager(TabContents& owner) : owner_(owner) { }
   void Stop() { NOTIMPLEMENTED(); }
   void Destroy() { }
   bool OnRenderViewGone(RenderViewHost*) {
diff --git a/chrome/common/thumbnail_score.h b/chrome/common/thumbnail_score.h
index c1ebb81..c3a5a90 100644
--- a/chrome/common/thumbnail_score.h
+++ b/chrome/common/thumbnail_score.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_COMMON_THUMBNAIL_SCORE_H__
-#define CHROME_BROWSER_COMMON_THUMBNAIL_SCORE_H__
+#ifndef CHROME_COMMON_THUMBNAIL_SCORE_H_
+#define CHROME_COMMON_THUMBNAIL_SCORE_H_
 
 #include "base/time.h"
 
@@ -79,4 +79,4 @@ struct ThumbnailScore {
 bool ShouldReplaceThumbnailWith(const ThumbnailScore& current,
                                 const ThumbnailScore& replacement);
 
-#endif  // CHROME_BROWSER_COMMON_THUMBNAIL_SCORE_H__
+#endif  // CHROME_COMMON_THUMBNAIL_SCORE_H_
diff --git a/chrome/common/visitedlink_common.cc b/chrome/common/visitedlink_common.cc
index 9c2b231..2782311 100644
--- a/chrome/common/visitedlink_common.cc
+++ b/chrome/common/visitedlink_common.cc
@@ -10,9 +10,9 @@
 const VisitedLinkCommon::Fingerprint VisitedLinkCommon::null_fingerprint_ = 0;
 const VisitedLinkCommon::Hash VisitedLinkCommon::null_hash_ = -1;
 
-VisitedLinkCommon::VisitedLinkCommon() :
-    hash_table_(NULL),
-    table_length_(0) {
+VisitedLinkCommon::VisitedLinkCommon()
+    : hash_table_(NULL),
+      table_length_(0) {
 }
 
 VisitedLinkCommon::~VisitedLinkCommon() {
diff --git a/chrome/common/visitedlink_common.h b/chrome/common/visitedlink_common.h
index ac8652b..0e79c04 100644
--- a/chrome/common/visitedlink_common.h
+++ b/chrome/common/visitedlink_common.h
@@ -134,4 +134,4 @@ class VisitedLinkCommon {
   DISALLOW_COPY_AND_ASSIGN(VisitedLinkCommon);
 };
 
-#endif // WIN_COMMON_VISITEDLINK_COMMON_H__
+#endif  // CHROME_COMMON_VISITEDLINK_COMMON_H_
diff --git a/chrome/common/web_resource/web_resource_unpacker.h b/chrome/common/web_resource/web_resource_unpacker.h
index 95600f9..f07c06f 100644
--- a/chrome/common/web_resource/web_resource_unpacker.h
+++ b/chrome/common/web_resource/web_resource_unpacker.h
@@ -9,8 +9,8 @@
 // it will be set up to unpack and verify image data in addition to
 // just parsing a JSON feed.
 
-#ifndef CHROME_COMMON_WEB_RESOURCE_UNPACKER_H_
-#define CHROME_COMMON_WEB_RESOURCE_UNPACKER_H_
+#ifndef CHROME_COMMON_WEB_RESOURCE_WEB_RESOURCE_UNPACKER_H_
+#define CHROME_COMMON_WEB_RESOURCE_WEB_RESOURCE_UNPACKER_H_
 
 #include <string>
 
@@ -52,6 +52,6 @@ class WebResourceUnpacker {
   DISALLOW_COPY_AND_ASSIGN(WebResourceUnpacker);
 };
 
-#endif  // CHROME_COMMON_WEB_RESOURCE_UNPACKER_H_
+#endif  // CHROME_COMMON_WEB_RESOURCE_WEB_RESOURCE_UNPACKER_H_
 
 
diff --git a/chrome/common/win_safe_util.h b/chrome/common/win_safe_util.h
index 8705d8a..d9c7097 100644
--- a/chrome/common/win_safe_util.h
+++ b/chrome/common/win_safe_util.h
@@ -48,4 +48,4 @@ bool SetInternetZoneIdentifier(const FilePath& full_path);
 
 }  // namespace win_util
 
-#endif // CHROME_COMMON_WIN_SAFE_UTIL_H__
+#endif  // CHROME_COMMON_WIN_SAFE_UTIL_H_
diff --git a/chrome/installer/gcapi/gcapi.h b/chrome/installer/gcapi/gcapi.h
index 8c6f74a..d5ec020 100644
--- a/chrome/installer/gcapi/gcapi.h
+++ b/chrome/installer/gcapi/gcapi.h
@@ -50,4 +50,4 @@ typedef BOOL (__stdcall * GCCC_LaunchGC)(HANDLE *);
 typedef BOOL (__stdcall * GCCC_LaunchGCWithDimensions)(int, int, int, int);
 }  // extern "C"
 
-#endif  // # CHROME_INSTALLER_GCAPI_GCAPI_H_
+#endif  // CHROME_INSTALLER_GCAPI_GCAPI_H_
diff --git a/chrome/installer/mini_installer/mini_installer.h b/chrome/installer/mini_installer/mini_installer.h
index 9cce8d2..45dc09b 100644
--- a/chrome/installer/mini_installer/mini_installer.h
+++ b/chrome/installer/mini_installer/mini_installer.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_INSTALLER_MINI_INSTALLER_
-#define CHROME_INSTALLER_MINI_INSTALLER_
+#ifndef CHROME_INSTALLER_MINI_INSTALLER_MINI_INSTALLER_H_
+#define CHROME_INSTALLER_MINI_INSTALLER_MINI_INSTALLER_H_
 
 // The windows command line to uncompress a LZ compressed file. It is a define
 // because we need the string to be writable. We don't need the full path
@@ -64,4 +64,5 @@ const wchar_t kManifestFilename[] = L"packed_files.txt";
 
 }  // namespace mini_installer
 
-#endif  // CHROME_INSTALLER_MINI_INSTALLER_
+#endif  // CHROME_INSTALLER_MINI_INSTALLER_MINI_INSTALLER_H_
+
diff --git a/chrome/installer/mini_installer/pe_resource.h b/chrome/installer/mini_installer/pe_resource.h
index 1f4dbac..288bdfc 100644
--- a/chrome/installer/mini_installer/pe_resource.h
+++ b/chrome/installer/mini_installer/pe_resource.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_INSTALLER_MINI_INSTALLER_PE_RESOURCE_
-#define CHROME_INSTALLER_MINI_INSTALLER_PE_RESOURCE_
+#ifndef CHROME_INSTALLER_MINI_INSTALLER_PE_RESOURCE_H_
+#define CHROME_INSTALLER_MINI_INSTALLER_PE_RESOURCE_H_
 
 #include <windows.h>
 
@@ -38,4 +38,4 @@ class PEResource {
   HMODULE module_;
 };
 
-#endif  // CHROME_INSTALLER_MINI_INSTALLER_PE_RESOURCE_
+#endif  // CHROME_INSTALLER_MINI_INSTALLER_PE_RESOURCE_H_
diff --git a/chrome/installer/setup/setup_util.h b/chrome/installer/setup/setup_util.h
index 3f646db..a2f1ee9 100644
--- a/chrome/installer/setup/setup_util.h
+++ b/chrome/installer/setup/setup_util.h
@@ -23,7 +23,7 @@ namespace setup_util {
   // distribution related install options. Merge them if any command line
   // options present (command line value takes precedence).
   DictionaryValue* GetInstallPreferences(const CommandLine& cmd_line);
-                     
+
   // Find the version of Chrome from an install source directory.
   // Chrome_path should contain a version folder.
   // Returns the first version found or NULL if no version is found.
diff --git a/chrome/installer/util/helper.h b/chrome/installer/util/helper.h
index afbbf17..132d718 100644
--- a/chrome/installer/util/helper.h
+++ b/chrome/installer/util/helper.h
@@ -4,8 +4,8 @@
 //
 // This file contains helper functions used by setup.
 
-#ifndef CHROME_INSTALLER_UTIL_HELPER_H__
-#define CHROME_INSTALLER_UTIL_HELPER_H__
+#ifndef CHROME_INSTALLER_UTIL_HELPER_H_
+#define CHROME_INSTALLER_UTIL_HELPER_H_
 
 #include <string>
 
@@ -47,4 +47,4 @@ void RemoveOldVersionDirs(const std::wstring& chrome_path,
 
 }  // namespace installer
 
-#endif
+#endif  // CHROME_INSTALLER_UTIL_HELPER_H_
diff --git a/chrome/installer/util/logging_installer.h b/chrome/installer/util/logging_installer.h
index b14c2a3..336d0c4 100644
--- a/chrome/installer/util/logging_installer.h
+++ b/chrome/installer/util/logging_installer.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_INSTALLER_LOGGING_INSTALLER_H__
-#define CHROME_INSTALLER_LOGGING_INSTALLER_H__
+#ifndef CHROME_INSTALLER_UTIL_LOGGING_INSTALLER_H_
+#define CHROME_INSTALLER_UTIL_LOGGING_INSTALLER_H_
 
 #include <string>
 
@@ -24,4 +24,4 @@ std::wstring GetLogFilePath(const CommandLine& command_line);
 
 } // namespace installer
 
-#endif
+#endif  // CHROME_INSTALLER_UTIL_LOGGING_INSTALLER_H_
diff --git a/chrome/installer/util/lzma_util.h b/chrome/installer/util/lzma_util.h
index e680444..01bd29e 100644
--- a/chrome/installer/util/lzma_util.h
+++ b/chrome/installer/util/lzma_util.h
@@ -14,7 +14,7 @@
 class LzmaUtil {
  public:
   // Utility method that does the job of calling OpenArchive(), UnPack()
-  // and CloseArchive() in order. Returns error code (NO_ERROR if successful). 
+  // and CloseArchive() in order. Returns error code (NO_ERROR if successful).
   static int32 UnPackArchive(const std::wstring& archive,
                              const std::wstring& output_dir,
                              std::wstring* output_file);
diff --git a/chrome/installer/util/version.h b/chrome/installer/util/version.h
index 8bbabce..1f02e00 100644
--- a/chrome/installer/util/version.h
+++ b/chrome/installer/util/version.h
@@ -12,7 +12,7 @@
 namespace installer {
 
 class Version {
-public:
+ public:
   virtual ~Version();
 
   // Check if the current version is higher than the version object passed
@@ -29,7 +29,7 @@ public:
   // Caller is responsible for freeing the Version object once done.
   static Version* GetVersionFromString(const std::wstring& version_str);
 
-private:
+ private:
   int64 major_;
   int64 minor_;
   int64 build_;
@@ -43,4 +43,4 @@ private:
 
 }  // namespace installer
 
-#endif
+#endif  // CHROME_INSTALLER_UTIL_VERSION_H_
diff --git a/chrome/nacl/sel_main.cc b/chrome/nacl/sel_main.cc
index 7258205..8b28fd4 100644
--- a/chrome/nacl/sel_main.cc
+++ b/chrome/nacl/sel_main.cc
@@ -40,12 +40,12 @@ static void __attribute__ ((noinline)) _ovly_debug_event (void) {
 
 #endif
 
-static void StopForDebuggerInit (const struct NaClApp *state) {
+static void StopForDebuggerInit(const struct NaClApp *state) {
   /* Put xlate_base in a place where gdb can find it.  */
   nacl_global_xlate_base = state->xlate_base;
 
 #ifdef __GNUC__
-  _ovly_debug_event ();
+  _ovly_debug_event();
 #endif
 }
 
diff --git a/chrome/plugin/plugin_channel_base.h b/chrome/plugin/plugin_channel_base.h
index 0e7a919..0263e9b 100644
--- a/chrome/plugin/plugin_channel_base.h
+++ b/chrome/plugin/plugin_channel_base.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_WEBKIT_GLUE_PLUGIN_CHANNEL_BASE_H_
-#define CHROME_WEBKIT_GLUE_PLUGIN_CHANNEL_BASE_H_
+#ifndef CHROME_PLUGIN_PLUGIN_CHANNEL_BASE_H_
+#define CHROME_PLUGIN_PLUGIN_CHANNEL_BASE_H_
 
 #include <string>
 
@@ -125,4 +125,4 @@ class PluginChannelBase : public IPC::Channel::Listener,
   DISALLOW_COPY_AND_ASSIGN(PluginChannelBase);
 };
 
-#endif  // CHROME_WEBKIT_GLUE_PLUGIN_CHANNEL_BASE_H_
+#endif  // CHROME_PLUGIN_PLUGIN_CHANNEL_BASE_H_
diff --git a/chrome/plugin/webplugin_proxy.cc b/chrome/plugin/webplugin_proxy.cc
index 61ecc7e..fd4bed9 100644
--- a/chrome/plugin/webplugin_proxy.cc
+++ b/chrome/plugin/webplugin_proxy.cc
@@ -528,7 +528,7 @@ void WebPluginProxy::SetWindowlessBuffer(
       windowless_context_);
 }
 
-#elif defined (OS_LINUX)
+#elif defined(OS_LINUX)
 
 void WebPluginProxy::SetWindowlessBuffer(
     const TransportDIB::Handle& windowless_buffer,
diff --git a/chrome/renderer/extensions/bindings_utils.h b/chrome/renderer/extensions/bindings_utils.h
index 471023c..558bd64 100644
--- a/chrome/renderer/extensions/bindings_utils.h
+++ b/chrome/renderer/extensions/bindings_utils.h
@@ -119,7 +119,7 @@ RenderView* GetRenderViewForCurrentContext();
 
 // Call the named javascript function with the given arguments in a context.
 // The function name should be reachable from the chromeHidden object, and can
-// be a sub-property like "Port.dispatchOnMessage". Returns the result of 
+// be a sub-property like "Port.dispatchOnMessage". Returns the result of
 // the function call. If an exception is thrown an empty Handle will be
 // returned.
 v8::Handle<v8::Value> CallFunctionInContext(v8::Handle<v8::Context> context,
diff --git a/chrome/renderer/extensions/js_only_v8_extensions.h b/chrome/renderer/extensions/js_only_v8_extensions.h
index 79b6c30..b87860f 100644
--- a/chrome/renderer/extensions/js_only_v8_extensions.h
+++ b/chrome/renderer/extensions/js_only_v8_extensions.h
@@ -28,4 +28,4 @@ class ExtensionApiTestV8Extension {
   static v8::Extension* Get();
 };
 
-#endif  // CHROME_RENDERER_JS_ONLY_V8_EXTENSIONS_H_
+#endif  // CHROME_RENDERER_EXTENSIONS_JS_ONLY_V8_EXTENSIONS_H_
diff --git a/chrome/renderer/external_extension.cc b/chrome/renderer/external_extension.cc
index f0e0bd5..e31c422 100644
--- a/chrome/renderer/external_extension.cc
+++ b/chrome/renderer/external_extension.cc
@@ -51,7 +51,7 @@ class ExternalExtensionWrapper : public v8::Extension {
     if (!renderview) return v8::Undefined();
 
     std::string name = std::string(*v8::String::Utf8Value(args[0]));
-    if (!name.length()) return v8::Undefined();;
+    if (!name.length()) return v8::Undefined();
 
     renderview->AddSearchProvider(name);
     return v8::Undefined();
diff --git a/chrome/renderer/external_extension.h b/chrome/renderer/external_extension.h
index d9e7b27..b5cb78b 100644
--- a/chrome/renderer/external_extension.h
+++ b/chrome/renderer/external_extension.h
@@ -4,8 +4,8 @@
 
 // Implements the window.external object.
 
-#ifndef CHROME_RENDERER_EXTENSIONS_V8_EXTERNAL_EXTENSION_H_
-#define CHROME_RENDERER_EXTENSIONS_V8_EXTERNAL_EXTENSION_H_
+#ifndef CHROME_RENDERER_EXTERNAL_EXTENSION_H_
+#define CHROME_RENDERER_EXTERNAL_EXTENSION_H_
 
 namespace v8 {
 class Extension;
@@ -20,4 +20,4 @@ class ExternalExtension {
 
 }  // namespace extensions_v8
 
-#endif  // CHROME_RENDERER_EXTENSIONS_V8_EXTERNAL_EXTENSION_H_
+#endif  // CHROME_RENDERER_EXTERNAL_EXTENSION_H_
diff --git a/chrome/renderer/loadtimes_extension_bindings.h b/chrome/renderer/loadtimes_extension_bindings.h
index 4a6bcf5..c97b0b1 100644
--- a/chrome/renderer/loadtimes_extension_bindings.h
+++ b/chrome/renderer/loadtimes_extension_bindings.h
@@ -5,8 +5,8 @@
 // The LoadTimesExtension is a v8 extension to access the time it took
 // to load a page.
 
-#ifndef CHROME_RENDERER_EXTENSIONS_LOADTIMES_EXTENSION_BINDINGS_H_
-#define CHROME_RENDERER_EXTENSIONS_LOADTIMES_EXTENSION_BINDINGS_H_
+#ifndef CHROME_RENDERER_LOADTIMES_EXTENSION_BINDINGS_H_
+#define CHROME_RENDERER_LOADTIMES_EXTENSION_BINDINGS_H_
 
 namespace v8 {
 class Extension;
@@ -21,4 +21,4 @@ class LoadTimesExtension {
 
 }  // namespace extensions_v8
 
-#endif  // CHROME_RENDERER_EXTENSIONS_LOADTIMES_EXTENSION_BINDINGS_H_
+#endif  // CHROME_RENDERER_LOADTIMES_EXTENSION_BINDINGS_H_
diff --git a/chrome/renderer/localized_error.h b/chrome/renderer/localized_error.h
index ff7da34..33300c4 100644
--- a/chrome/renderer/localized_error.h
+++ b/chrome/renderer/localized_error.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_RENDERER_LOCALIZED_ERROR_VALUES_H__
-#define CHROME_RENDERER_LOCALIZED_ERROR_VALUES_H__
+#ifndef CHROME_RENDERER_LOCALIZED_ERROR_H_
+#define CHROME_RENDERER_LOCALIZED_ERROR_H_
 
 class DictionaryValue;
 class GURL;
@@ -22,4 +22,4 @@ void GetLocalizedErrorValues(const WebKit::WebURLError& error,
 void GetFormRepostErrorValues(const GURL& display_url,
                               DictionaryValue* error_strings);
 
-#endif  // CHROME_RENDERER_LOCALIZED_ERROR_VALUES_H__
+#endif  // CHROME_RENDERER_LOCALIZED_ERROR_H_
diff --git a/chrome/renderer/net/render_dns_master.h b/chrome/renderer/net/render_dns_master.h
index 81f1d32..fa735de 100644
--- a/chrome/renderer/net/render_dns_master.h
+++ b/chrome/renderer/net/render_dns_master.h
@@ -18,8 +18,8 @@
 // sent names.  If the entire queue is processed, then the list of "sent names"
 // is cleared so that future gatherings may again pass along the same names.
 
-#ifndef CHROME_RENDERER_RENDER_NET_DNS_MASTER_H__
-#define CHROME_RENDERER_RENDER_NET_DNS_MASTER_H__
+#ifndef CHROME_RENDERER_NET_RENDER_DNS_MASTER_H_
+#define CHROME_RENDERER_NET_RENDER_DNS_MASTER_H_
 
 #include <map>
 #include <string>
@@ -106,4 +106,4 @@ class RenderDnsMaster {
   DISALLOW_EVIL_CONSTRUCTORS(RenderDnsMaster);
 };  // class RenderDnsMaster
 
-#endif  // CHROME_RENDERER_RENDER_NET_DNS_MASTER_H__
+#endif  // CHROME_RENDERER_NET_RENDER_DNS_MASTER_H_
diff --git a/chrome/renderer/plugin_channel_host.h b/chrome/renderer/plugin_channel_host.h
index b37ab99..53289b9 100644
--- a/chrome/renderer/plugin_channel_host.h
+++ b/chrome/renderer/plugin_channel_host.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_PLUGIN_PLUGIN_CHANNEL_HOST_H__
-#define CHROME_PLUGIN_PLUGIN_CHANNEL_HOST_H__
+#ifndef CHROME_RENDERER_PLUGIN_CHANNEL_HOST_H_
+#define CHROME_RENDERER_PLUGIN_CHANNEL_HOST_H_
 
 #include "base/hash_tables.h"
 #include "chrome/plugin/plugin_channel_base.h"
@@ -54,4 +54,4 @@ class PluginChannelHost : public PluginChannelBase {
   DISALLOW_EVIL_CONSTRUCTORS(PluginChannelHost);
 };
 
-#endif  // CHROME_PLUGIN_PLUGIN_CHANNEL_HOST_H__
+#endif  // CHROME_RENDERER_PLUGIN_CHANNEL_HOST_H_
diff --git a/chrome/renderer/render_thread.h b/chrome/renderer/render_thread.h
index bca3ea6..44dc6ab 100644
--- a/chrome/renderer/render_thread.h
+++ b/chrome/renderer/render_thread.h
@@ -81,7 +81,7 @@ class RenderThread : public RenderThreadBase,
   // Grabs the IPC channel name from the command line.
   RenderThread();
   // Constructor that's used when running in single process mode.
-  RenderThread(const std::string& channel_name);
+  explicit RenderThread(const std::string& channel_name);
   virtual ~RenderThread();
 
   // Returns the one render thread for this process.  Note that this should only
diff --git a/chrome/renderer/renderer_histogram_snapshots.h b/chrome/renderer/renderer_histogram_snapshots.h
index 0a1238c..db4cd4b 100644
--- a/chrome/renderer/renderer_histogram_snapshots.h
+++ b/chrome/renderer/renderer_histogram_snapshots.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_RENDERER_HISTOGRAM_SNAPSHOTS_H_
-#define CHROME_RENDERER_HISTOGRAM_SNAPSHOTS_H_
+#ifndef CHROME_RENDERER_RENDERER_HISTOGRAM_SNAPSHOTS_H_
+#define CHROME_RENDERER_RENDERER_HISTOGRAM_SNAPSHOTS_H_
 
 #include <list>
 #include <map>
@@ -50,4 +50,4 @@ class RendererHistogramSnapshots {
   DISALLOW_COPY_AND_ASSIGN(RendererHistogramSnapshots);
 };
 
-#endif  // CHROME_RENDERER_HISTOGRAM_SNAPSHOTS_H_
+#endif  // CHROME_RENDERER_RENDERER_HISTOGRAM_SNAPSHOTS_H_
diff --git a/chrome/renderer/renderer_main_platform_delegate.h b/chrome/renderer/renderer_main_platform_delegate.h
index 8f1e453..3f9c426 100644
--- a/chrome/renderer/renderer_main_platform_delegate.h
+++ b/chrome/renderer/renderer_main_platform_delegate.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_RENDERER_RENDERER_PLATFORM_DELEGATE_H_
-#define CHROME_RENDERER_RENDERER_PLATFORM_DELEGATE_H_
+#ifndef CHROME_RENDERER_RENDERER_MAIN_PLATFORM_DELEGATE_H_
+#define CHROME_RENDERER_RENDERER_MAIN_PLATFORM_DELEGATE_H_
 
 #include "chrome/common/main_function_params.h"
 
 class RendererMainPlatformDelegate {
  public:
-  RendererMainPlatformDelegate(const MainFunctionParams& parameters);
+  explicit RendererMainPlatformDelegate(const MainFunctionParams& parameters);
   ~RendererMainPlatformDelegate();
 
   // Called first thing and last thing in the process' lifecycle, i.e. before
@@ -36,4 +36,4 @@ class RendererMainPlatformDelegate {
   DISALLOW_COPY_AND_ASSIGN(RendererMainPlatformDelegate);
 };
 
-#endif  // CHROME_RENDERER_RENDERER_PLATFORM_DELEGATE_H_
+#endif  // CHROME_RENDERER_RENDERER_MAIN_PLATFORM_DELEGATE_H_
diff --git a/chrome/renderer/renderer_sandbox_support_linux.h b/chrome/renderer/renderer_sandbox_support_linux.h
index b7d6b77..f8f080e 100644
--- a/chrome/renderer/renderer_sandbox_support_linux.h
+++ b/chrome/renderer/renderer_sandbox_support_linux.h
@@ -2,8 +2,8 @@
 // source code is governed by a BSD-style license that can be found in the
 // LICENSE file.
 
-#ifndef CHROME_RENDERER_RENDERER_SANDBOX_SUPPORT_H_
-#define CHROME_RENDERER_RENDERER_SANDBOX_SUPPORT_H_
+#ifndef CHROME_RENDERER_RENDERER_SANDBOX_SUPPORT_LINUX_H_
+#define CHROME_RENDERER_RENDERER_SANDBOX_SUPPORT_LINUX_H_
 
 #include <stdint.h>
 
@@ -22,4 +22,4 @@ std::string getFontFamilyForCharacters(const uint16_t* utf16, size_t num_utf16);
 
 };  // namespace render_sandbox_support
 
-#endif  // CHROME_RENDERER_RENDER_SANDBOX_SUPPORT_H_
+#endif  // CHROME_RENDERER_RENDERER_SANDBOX_SUPPORT_LINUX_H_
diff --git a/chrome/renderer/renderer_web_database_observer.h b/chrome/renderer/renderer_web_database_observer.h
index 4c06853..8d7ce56 100644
--- a/chrome/renderer/renderer_web_database_observer.h
+++ b/chrome/renderer/renderer_web_database_observer.h
@@ -19,4 +19,4 @@ class RendererWebDatabaseObserver : public WebKit::WebDatabaseObserver {
   IPC::Message::Sender* sender_;
 };
 
-#endif  // CHROME_RENDERER_WEB_DATABASE_OBSERVER_H_
+#endif  // CHROME_RENDERER_RENDERER_WEB_DATABASE_OBSERVER_H_
diff --git a/chrome/renderer/renderer_webkitclient_impl.h b/chrome/renderer/renderer_webkitclient_impl.h
index cf97ad7..eb77dce 100644
--- a/chrome/renderer/renderer_webkitclient_impl.h
+++ b/chrome/renderer/renderer_webkitclient_impl.h
@@ -2,8 +2,8 @@
 // source code is governed by a BSD-style license that can be found in the
 // LICENSE file.
 
-#ifndef CHROME_RENDERER_RENDERER_WEBKIT_CLIENT_IMPL_H_
-#define CHROME_RENDERER_RENDERER_WEBKIT_CLIENT_IMPL_H_
+#ifndef CHROME_RENDERER_RENDERER_WEBKITCLIENT_IMPL_H_
+#define CHROME_RENDERER_RENDERER_WEBKITCLIENT_IMPL_H_
 
 #include "base/platform_file.h"
 #include "chrome/renderer/websharedworkerrepository_impl.h"
@@ -122,4 +122,4 @@ class RendererWebKitClientImpl : public webkit_glue::WebKitClientImpl {
 
 };
 
-#endif  // CHROME_RENDERER_WEBKIT_CLIENT_IMPL_H_
+#endif  // CHROME_RENDERER_RENDERER_WEBKITCLIENT_IMPL_H_
diff --git a/chrome/renderer/renderer_webstoragearea_impl.h b/chrome/renderer/renderer_webstoragearea_impl.h
index 2a13bf8..040c9db 100644
--- a/chrome/renderer/renderer_webstoragearea_impl.h
+++ b/chrome/renderer/renderer_webstoragearea_impl.h
@@ -32,4 +32,4 @@ class RendererWebStorageAreaImpl : public WebKit::WebStorageArea {
   int64 storage_area_id_;
 };
 
-#endif  // CHROME_RENDERER_WEBSTORAGEAREA_IMPL_H_
+#endif  // CHROME_RENDERER_RENDERER_WEBSTORAGEAREA_IMPL_H_
diff --git a/chrome/renderer/renderer_webstoragenamespace_impl.h b/chrome/renderer/renderer_webstoragenamespace_impl.h
index fd01435..391a157 100644
--- a/chrome/renderer/renderer_webstoragenamespace_impl.h
+++ b/chrome/renderer/renderer_webstoragenamespace_impl.h
@@ -33,4 +33,4 @@ class RendererWebStorageNamespaceImpl : public WebKit::WebStorageNamespace {
   static const int64 kUninitializedNamespaceId = -1;
 };
 
-#endif  // CHROME_RENDERER_WEBSTORAGENAMESPACE_IMPL_H_
+#endif  // CHROME_RENDERER_RENDERER_WEBSTORAGENAMESPACE_IMPL_H_
diff --git a/chrome/renderer/spellchecker/spellcheck.h b/chrome/renderer/spellchecker/spellcheck.h
index eb3ad82..ef194bd 100644
--- a/chrome/renderer/spellchecker/spellcheck.h
+++ b/chrome/renderer/spellchecker/spellcheck.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_RENDERER_SPELLCHECKER_SPELLCHECKER_H_
-#define CHROME_RENDERER_SPELLCHECKER_SPELLCHECKER_H_
+#ifndef CHROME_RENDERER_SPELLCHECKER_SPELLCHECK_H_
+#define CHROME_RENDERER_SPELLCHECKER_SPELLCHECK_H_
 
 #include <queue>
 #include <string>
@@ -120,4 +120,4 @@ class SpellCheck {
   DISALLOW_COPY_AND_ASSIGN(SpellCheck);
 };
 
-#endif  // CHROME_RENDERER_SPELLCHECKER_SPELLCHECKER_H_
+#endif  // CHROME_RENDERER_SPELLCHECKER_SPELLCHECK_H_
diff --git a/chrome/renderer/user_script_slave.h b/chrome/renderer/user_script_slave.h
index 5d3ae6b..6c32c42 100644
--- a/chrome/renderer/user_script_slave.h
+++ b/chrome/renderer/user_script_slave.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_EXTENSIONS_USER_SCRIPT_SLAVE_H_
-#define CHROME_BROWSER_EXTENSIONS_USER_SCRIPT_SLAVE_H_
+#ifndef CHROME_RENDERER_USER_SCRIPT_SLAVE_H_
+#define CHROME_RENDERER_USER_SCRIPT_SLAVE_H_
 
 #include <map>
 #include <string>
@@ -53,4 +53,4 @@ class UserScriptSlave {
   DISALLOW_COPY_AND_ASSIGN(UserScriptSlave);
 };
 
-#endif  // CHROME_BROWSER_EXTENSIONS_USER_SCRIPT_SLAVE_H_
+#endif  // CHROME_RENDERER_USER_SCRIPT_SLAVE_H_
diff --git a/chrome/renderer/webplugin_delegate_proxy.h b/chrome/renderer/webplugin_delegate_proxy.h
index 5aa7a4a..d9cb3b3 100644
--- a/chrome/renderer/webplugin_delegate_proxy.h
+++ b/chrome/renderer/webplugin_delegate_proxy.h
@@ -36,11 +36,11 @@ class WaitableEvent;
 
 // An implementation of WebPluginDelegate that proxies all calls to
 // the plugin process.
-class WebPluginDelegateProxy :
-    public webkit_glue::WebPluginDelegate,
-    public IPC::Channel::Listener,
-    public IPC::Message::Sender,
-    public base::SupportsWeakPtr<WebPluginDelegateProxy> {
+class WebPluginDelegateProxy
+    : public webkit_glue::WebPluginDelegate,
+      public IPC::Channel::Listener,
+      public IPC::Message::Sender,
+      public base::SupportsWeakPtr<WebPluginDelegateProxy> {
  public:
   WebPluginDelegateProxy(const std::string& mime_type,
                          const base::WeakPtr<RenderView>& render_view);
diff --git a/chrome/renderer/websharedworkerrepository_impl.h b/chrome/renderer/websharedworkerrepository_impl.h
index 5806485..eb20c2d 100644
--- a/chrome/renderer/websharedworkerrepository_impl.h
+++ b/chrome/renderer/websharedworkerrepository_impl.h
@@ -2,8 +2,8 @@
 // source code is governed by a BSD-style license that can be found in the
 // LICENSE file.
 
-#ifndef CHROME_RENDERER_WEB_SHARED_WORKER_REPOSITORY_IMPL_H_
-#define CHROME_RENDERER_WEB_SHARED_WORKER_REPOSITORY_IMPL_H_
+#ifndef CHROME_RENDERER_WEBSHAREDWORKERREPOSITORY_IMPL_H_
+#define CHROME_RENDERER_WEBSHAREDWORKERREPOSITORY_IMPL_H_
 
 #include "third_party/WebKit/WebKit/chromium/public/WebSharedWorkerRepository.h"
 
@@ -27,4 +27,4 @@ class WebSharedWorkerRepositoryImpl : public WebKit::WebSharedWorkerRepository {
     DocumentSet shared_worker_parents_;
 };
 
-#endif  // CHROME_RENDERER_WEB_SHARED_WORKER_REPOSITORY_IMPL_H_
+#endif  // CHROME_RENDERER_WEBSHAREDWORKERREPOSITORY_IMPL_H_
diff --git a/chrome/test/automation/autocomplete_edit_proxy.h b/chrome/test/automation/autocomplete_edit_proxy.h
index b0594d8..abbe849 100644
--- a/chrome/test/automation/autocomplete_edit_proxy.h
+++ b/chrome/test/automation/autocomplete_edit_proxy.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_TEST_AUTOMATION_AUTOCOMPLETE_EDIT_PROXY_H__
-#define CHROME_TEST_AUTOMATION_AUTOCOMPLETE_EDIT_PROXY_H__
+#ifndef CHROME_TEST_AUTOMATION_AUTOCOMPLETE_EDIT_PROXY_H_
+#define CHROME_TEST_AUTOMATION_AUTOCOMPLETE_EDIT_PROXY_H_
 
 #include <string>
 #include <vector>
@@ -149,4 +149,4 @@ class AutocompleteEditProxy : public AutomationResourceProxy {
   DISALLOW_EVIL_CONSTRUCTORS(AutocompleteEditProxy);
 };
 
-#endif  // #define CHROME_TEST_AUTOMATION_AUTOCOMPLETE_EDIT_PROXY_H__
+#endif  // CHROME_TEST_AUTOMATION_AUTOCOMPLETE_EDIT_PROXY_H_
diff --git a/chrome/test/automation/automation_handle_tracker.h b/chrome/test/automation/automation_handle_tracker.h
index 12a5920..1db6015 100644
--- a/chrome/test/automation/automation_handle_tracker.h
+++ b/chrome/test/automation/automation_handle_tracker.h
@@ -74,7 +74,7 @@ class AutomationResourceProxy
 // discard the handle.
 class AutomationHandleTracker {
  public:
-  AutomationHandleTracker(AutomationMessageSender* sender)
+  explicit AutomationHandleTracker(AutomationMessageSender* sender)
       : sender_(sender) {}
   ~AutomationHandleTracker();
 
diff --git a/chrome/test/chrome_plugin/test_chrome_plugin.cc b/chrome/test/chrome_plugin/test_chrome_plugin.cc
index 50672d0..751a9c2 100644
--- a/chrome/test/chrome_plugin/test_chrome_plugin.cc
+++ b/chrome/test/chrome_plugin/test_chrome_plugin.cc
@@ -46,7 +46,7 @@ void STDCALL InvokeLaterCallback(void* data) {
 // ResponseStream: Manages the streaming of the payload data.
 
 class ResponseStream : public base::RefCounted<ResponseStream> {
-public:
+ public:
   ResponseStream(const TestResponsePayload* payload, CPRequest* request);
 
   void Init();
@@ -227,13 +227,13 @@ int STDCALL CPR_Read(CPRequest* request, void* buf, uint32 buf_size) {
 // RequestResponse: manages the retrieval of response data from the host
 
 class RequestResponse {
-public:
+ public:
   explicit RequestResponse(const std::string& raw_headers)
       : raw_headers_(raw_headers), offset_(0) {}
   void StartReading(CPRequest* request);
   void ReadCompleted(CPRequest* request, int bytes_read);
 
-private:
+ private:
   std::string raw_headers_;
   std::string body_;
   int offset_;
diff --git a/chrome/test/live_sync/live_bookmarks_sync_test.h b/chrome/test/live_sync/live_bookmarks_sync_test.h
index c9d4486..1ff0251 100644
--- a/chrome/test/live_sync/live_bookmarks_sync_test.h
+++ b/chrome/test/live_sync/live_bookmarks_sync_test.h
@@ -78,4 +78,4 @@ class LiveBookmarksSyncTest : public InProcessBrowserTest {
   DISALLOW_COPY_AND_ASSIGN(LiveBookmarksSyncTest);
 };
 
-#endif  // CHROME_TEST_SYNC_LIVE_BOOKMARKS_SYNC_TEST_H_
+#endif  // CHROME_TEST_LIVE_SYNC_LIVE_BOOKMARKS_SYNC_TEST_H_
diff --git a/chrome/test/live_sync/profile_sync_service_test_harness.h b/chrome/test/live_sync/profile_sync_service_test_harness.h
index f242be3..8877c70 100644
--- a/chrome/test/live_sync/profile_sync_service_test_harness.h
+++ b/chrome/test/live_sync/profile_sync_service_test_harness.h
@@ -105,4 +105,4 @@ class ProfileSyncServiceTestHarness : public ProfileSyncServiceObserver {
   DISALLOW_COPY_AND_ASSIGN(ProfileSyncServiceTestHarness);
 };
 
-#endif  // CHROME_TEST_SYNC_PROFILE_SYNC_SERVICE_TEST_HARNESS_H_
+#endif  // CHROME_TEST_LIVE_SYNC_PROFILE_SYNC_SERVICE_TEST_HARNESS_H_
diff --git a/chrome/test/mini_installer_test/mini_installer_test_constants.cc b/chrome/test/mini_installer_test/mini_installer_test_constants.cc
index cbb4533..c26b990 100644
--- a/chrome/test/mini_installer_test/mini_installer_test_constants.cc
+++ b/chrome/test/mini_installer_test/mini_installer_test_constants.cc
@@ -50,7 +50,8 @@ const wchar_t kFullInstall[] = L"Full";
 const wchar_t kChromeMetaInstallerExe[] =
     L"\\\\172.23.44.61\\shared\\chrome_autotest\\beta_build\\ChromeSetup.exe";
 const wchar_t kChromeStandAloneInstallerLocation[] =
-    L"\\\\172.24.6.7\\shares\\googleclient\\nightly\\builds\\Win-OmahaInstallers\\latest\\opt-win\\staging\\";
+    L"\\\\172.24.6.7\\shares\\googleclient\\nightly\\builds\\"
+    L"Win-OmahaInstallers\\latest\\opt-win\\staging\\";
 const wchar_t kChromeApplyTagExe[] =
     L"\\\\172.23.44.61\\shared\\chrome_autotest\\ApplyTag.exe";
 const wchar_t kChromeApplyTagParameters[] =
diff --git a/chrome/test/reliability/page_load_test.h b/chrome/test/reliability/page_load_test.h
index b369ead..12c26d1 100644
--- a/chrome/test/reliability/page_load_test.h
+++ b/chrome/test/reliability/page_load_test.h
@@ -13,4 +13,4 @@
 // Parse the command line options and set the page range accordingly.
 void SetPageRange(const CommandLine&);
 
-#endif // CHROME_TEST_RELIABILITY_PAGE_LOAD_TEST_H_
+#endif  // CHROME_TEST_RELIABILITY_PAGE_LOAD_TEST_H_
diff --git a/chrome/test/reliability/reliability_test_suite.h b/chrome/test/reliability/reliability_test_suite.h
index 0bd1bc2..a161d8a 100644
--- a/chrome/test/reliability/reliability_test_suite.h
+++ b/chrome/test/reliability/reliability_test_suite.h
@@ -9,12 +9,11 @@
 #include "chrome/test/ui/ui_test_suite.h"
 
 class ReliabilityTestSuite : public UITestSuite {
-public:
+ public:
   ReliabilityTestSuite(int argc, char** argv) : UITestSuite(argc, argv) {
   }
 
-protected:
-
+ protected:
   virtual void Initialize() {
     UITestSuite::Initialize();
 
@@ -22,4 +21,4 @@ protected:
   }
 };
 
-#endif // CHROME_TEST_RELIABILITY_RELIABILITY_TEST_SUITE_H_
+#endif  // CHROME_TEST_RELIABILITY_RELIABILITY_TEST_SUITE_H_
diff --git a/chrome/test/sync/engine/test_directory_setter_upper.h b/chrome/test/sync/engine/test_directory_setter_upper.h
index aefca40..95cb13d 100644
--- a/chrome/test/sync/engine/test_directory_setter_upper.h
+++ b/chrome/test/sync/engine/test_directory_setter_upper.h
@@ -93,7 +93,7 @@ class TriggeredOpenTestDirectorySetterUpper : public TestDirectorySetterUpper {
   // A triggered open is typically in response to a successful auth event just
   // as in "real life".  In this case, the name that will be used should be
   // deterministically known at construction, and is passed in |name|.
-  TriggeredOpenTestDirectorySetterUpper(const std::string& name);
+  explicit TriggeredOpenTestDirectorySetterUpper(const std::string& name);
   virtual void SetUp();
   virtual void TearDown();
 };
diff --git a/chrome/test/test_launcher/test_runner.h b/chrome/test/test_launcher/test_runner.h
index 6700dde..9c743f8 100644
--- a/chrome/test/test_launcher/test_runner.h
+++ b/chrome/test/test_launcher/test_runner.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_TEST_TEST_LAUNCHER_TEST_RUNNER_
-#define CHROME_TEST_TEST_LAUNCHER_TEST_RUNNER_
+#ifndef CHROME_TEST_TEST_LAUNCHER_TEST_RUNNER_H_
+#define CHROME_TEST_TEST_LAUNCHER_TEST_RUNNER_H_
 
 #include <string>
 #include <vector>
@@ -49,4 +49,4 @@ class TestRunnerFactory {
 
 }  // namespace
 
-#endif  // CHROME_TEST_TEST_LAUNCHER_TEST_RUNNER_
+#endif  // CHROME_TEST_TEST_LAUNCHER_TEST_RUNNER_H_
diff --git a/chrome/test/test_notification_tracker.h b/chrome/test/test_notification_tracker.h
index fbc2392..2307b4b 100644
--- a/chrome/test/test_notification_tracker.h
+++ b/chrome/test/test_notification_tracker.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_TEST_NOTIFICATION_TRACKER_H_
-#define CHROME_TEST_NOTIFICATION_TRACKER_H_
+#ifndef CHROME_TEST_TEST_NOTIFICATION_TRACKER_H_
+#define CHROME_TEST_TEST_NOTIFICATION_TRACKER_H_
 
 #include <vector>
 
@@ -76,4 +76,4 @@ class TestNotificationTracker : public NotificationObserver {
   DISALLOW_COPY_AND_ASSIGN(TestNotificationTracker);
 };
 
-#endif  // CHROME_TEST_NOTIFICATION_TRACKER_H_
+#endif  // CHROME_TEST_TEST_NOTIFICATION_TRACKER_H_
diff --git a/chrome/tools/convert_dict/aff_reader.h b/chrome/tools/convert_dict/aff_reader.h
index 411bde8..d870d88 100644
--- a/chrome/tools/convert_dict/aff_reader.h
+++ b/chrome/tools/convert_dict/aff_reader.h
@@ -14,7 +14,7 @@ namespace convert_dict {
 
 class AffReader {
  public:
-  AffReader(const std::string& filename);
+  explicit AffReader(const std::string& filename);
   ~AffReader();
 
   bool Read();
@@ -60,7 +60,7 @@ class AffReader {
   int AddAffixGroup(std::string* rule);  // Returns the new affix group ID.
   void AddAffix(std::string* rule);  // SFX/PFX
   void AddReplacement(std::string* rule);
-  //void HandleFlag(std::string* rule);
+  // void HandleFlag(std::string* rule);
 
   // Used to handle "other" commands. The "raw" just saves the line as-is.
   // The "encoded" version converts the line to UTF-8 and saves it.
diff --git a/chrome/tools/convert_dict/dic_reader.h b/chrome/tools/convert_dict/dic_reader.h
index 22b20a8..efb06a7 100644
--- a/chrome/tools/convert_dict/dic_reader.h
+++ b/chrome/tools/convert_dict/dic_reader.h
@@ -23,7 +23,7 @@ class DicReader {
   typedef std::pair<std::string, std::vector<int> > WordEntry;
   typedef std::vector<WordEntry> WordList;
 
-  DicReader(const std::string& filename);
+  explicit DicReader(const std::string& filename);
   ~DicReader();
 
   // Non-numeric affixes will be added to the given AffReader and converted into
diff --git a/chrome/tools/convert_dict/hunspell_reader.h b/chrome/tools/convert_dict/hunspell_reader.h
index bc7c8c5..a19bba3 100644
--- a/chrome/tools/convert_dict/hunspell_reader.h
+++ b/chrome/tools/convert_dict/hunspell_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_TOOLS_DIC_CONVERTER_HUNSPELL_READER_H__
-#define CHROME_TOOLS_DIC_CONVERTER_HUNSPELL_READER_H__
+#ifndef CHROME_TOOLS_CONVERT_DICT_HUNSPELL_READER_H_
+#define CHROME_TOOLS_CONVERT_DICT_HUNSPELL_READER_H_
 
 #include <string>
 
@@ -22,4 +22,4 @@ void StripComment(std::string* line);
 
 }  // namespace convert_dict
 
-#endif  // CHROME_TOOLS_DIC_CONVERTER_HUNSPELL_READER_H__
+#endif  // CHROME_TOOLS_CONVERT_DICT_HUNSPELL_READER_H_
diff --git a/chrome/tools/crash_service/crash_service.h b/chrome/tools/crash_service/crash_service.h
index 3197eea..d074fec 100644
--- a/chrome/tools/crash_service/crash_service.h
+++ b/chrome/tools/crash_service/crash_service.h
@@ -1,8 +1,9 @@
 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
-#ifndef CHROME_TOOLS_CRASH_SERVICE__
-#define CHROME_TOOLS_CRASH_SERVICE__
+
+#ifndef CHROME_TOOLS_CRASH_SERVICE_CRASH_SERVICE_H_
+#define CHROME_TOOLS_CRASH_SERVICE_CRASH_SERVICE_H_
 
 #include <string>
 
@@ -28,7 +29,7 @@ class CrashService {
  public:
   // The ctor takes a directory that needs to be writable and will create
   // a subdirectory inside to keep logs, crashes and checkpoint files.
-  CrashService(const std::wstring& report_dir);
+  explicit CrashService(const std::wstring& report_dir);
   ~CrashService();
 
   // Starts servicing crash dumps. The command_line specifies various behaviors,
@@ -110,5 +111,4 @@ class CrashService {
   DISALLOW_EVIL_CONSTRUCTORS(CrashService);
 };
 
-
-#endif  // CHROME_TOOLS_CRASH_SERVICE__
+#endif  // CHROME_TOOLS_CRASH_SERVICE_CRASH_SERVICE_H_
diff --git a/chrome/worker/nativewebworker_impl.h b/chrome/worker/nativewebworker_impl.h
index ac7e801..7f610a0 100644
--- a/chrome/worker/nativewebworker_impl.h
+++ b/chrome/worker/nativewebworker_impl.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_WORKER_NATIVEWORKER_H_
-#define CHROME_WORKER_NATIVEWORKER_H_
+#ifndef CHROME_WORKER_NATIVEWEBWORKER_IMPL_H_
+#define CHROME_WORKER_NATIVEWEBWORKER_IMPL_H_
 
 #include "base/basictypes.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebWorker.h"
@@ -43,4 +43,4 @@ class NativeWebWorkerImpl : public WebKit::WebWorker {
   DISALLOW_COPY_AND_ASSIGN(NativeWebWorkerImpl);
 };
 
-#endif  // CHROME_WORKER_NATIVEWEBWORKER_H_
+#endif  // CHROME_WORKER_NATIVEWEBWORKER_IMPL_H_
diff --git a/chrome/worker/nativewebworker_stub.h b/chrome/worker/nativewebworker_stub.h
index 6afe1db..1edd6a5 100644
--- a/chrome/worker/nativewebworker_stub.h
+++ b/chrome/worker/nativewebworker_stub.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_WORKER_NATIVEWORKER_STUB_H_
-#define CHROME_WORKER_NATIVEWORKER_STUB_H_
+#ifndef CHROME_WORKER_NATIVEWEBWORKER_STUB_H_
+#define CHROME_WORKER_NATIVEWEBWORKER_STUB_H_
 // Native WebWorker support stub header.
 
 #include <stddef.h>
@@ -60,4 +60,4 @@ int NaClSrpcListenerLoop(struct NaClDesc *chrome_desc,
 void NaClDestroyUpcallChannel(struct NaClDesc* desc[2]);
 }
 
-#endif  // CHROME_WORKER_NATIVEWORKER_STUB_H_
+#endif  // CHROME_WORKER_NATIVEWEBWORKER_STUB_H_
diff --git a/chrome/worker/websharedworker_stub.h b/chrome/worker/websharedworker_stub.h
index 426aaad..b12cd99 100644
--- a/chrome/worker/websharedworker_stub.h
+++ b/chrome/worker/websharedworker_stub.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_WORKER_WEB_SHARED_WORKER_STUB_H_
-#define CHROME_WORKER_WEB_SHARED_WORKER_STUB_H_
+#ifndef CHROME_WORKER_WEBSHAREDWORKER_STUB_H_
+#define CHROME_WORKER_WEBSHAREDWORKER_STUB_H_
 
 #include "chrome/worker/webworker_stub_base.h"
 #include "chrome/worker/webworkerclient_proxy.h"
@@ -38,4 +38,4 @@ class WebSharedWorkerStub : public WebWorkerStubBase {
   DISALLOW_COPY_AND_ASSIGN(WebSharedWorkerStub);
 };
 
-#endif  // CHROME_WORKER_WEB_SHARED_WORKER_STUB_H_
+#endif  // CHROME_WORKER_WEBSHAREDWORKER_STUB_H_
diff --git a/chrome/worker/webworker_stub.h b/chrome/worker/webworker_stub.h
index d83a4b7..59a46f1 100644
--- a/chrome/worker/webworker_stub.h
+++ b/chrome/worker/webworker_stub.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_WORKER_WEB_WORKER_STUB_H_
-#define CHROME_WORKER_WEB_WORKER_STUB_H_
+#ifndef CHROME_WORKER_WEBWORKER_STUB_H_
+#define CHROME_WORKER_WEBWORKER_STUB_H_
 
 #include "chrome/worker/webworker_stub_base.h"
 #include "chrome/worker/webworkerclient_proxy.h"
@@ -35,4 +35,4 @@ class WebWorkerStub : public WebWorkerStubBase {
   DISALLOW_COPY_AND_ASSIGN(WebWorkerStub);
 };
 
-#endif  // CHROME_WORKER_WEB_WORKER_STUB_H_
+#endif  // CHROME_WORKER_WEBWORKER_STUB_H_
diff --git a/chrome/worker/webworker_stub_base.h b/chrome/worker/webworker_stub_base.h
index 1e5ec12..397f517 100644
--- a/chrome/worker/webworker_stub_base.h
+++ b/chrome/worker/webworker_stub_base.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_WORKER_WEB_WORKER_STUB_BASE_H_
-#define CHROME_WORKER_WEB_WORKER_STUB_BASE_H_
+#ifndef CHROME_WORKER_WEBWORKER_STUB_BASE_H_
+#define CHROME_WORKER_WEBWORKER_STUB_BASE_H_
 
 #include "chrome/worker/webworkerclient_proxy.h"
 #include "ipc/ipc_channel.h"
@@ -12,7 +12,7 @@
 // WebSharedWorkerStub and contains common setup/teardown functionality.
 class WebWorkerStubBase : public IPC::Channel::Listener {
  public:
-  WebWorkerStubBase(int route_id);
+  explicit WebWorkerStubBase(int route_id);
   virtual ~WebWorkerStubBase();
 
   // Invoked when the WebWorkerClientProxy is shutting down.
@@ -33,4 +33,4 @@ class WebWorkerStubBase : public IPC::Channel::Listener {
   DISALLOW_COPY_AND_ASSIGN(WebWorkerStubBase);
 };
 
-#endif  // CHROME_WORKER_WEB_WORKER_STUB_BASE_H_
+#endif  // CHROME_WORKER_WEBWORKER_STUB_BASE_H_
diff --git a/chrome/worker/worker_webkitclient_impl.h b/chrome/worker/worker_webkitclient_impl.h
index 0cb213c..23b75d8 100644
--- a/chrome/worker/worker_webkitclient_impl.h
+++ b/chrome/worker/worker_webkitclient_impl.h
@@ -2,8 +2,8 @@
 // source code is governed by a BSD-style license that can be found in the
 // LICENSE file.
 
-#ifndef CHROME_WORKER_WORKER_WEBKIT_CLIENT_IMPL_H_
-#define CHROME_WORKER_WORKER_WEBKIT_CLIENT_IMPL_H_
+#ifndef CHROME_WORKER_WORKER_WEBKITCLIENT_IMPL_H_
+#define CHROME_WORKER_WORKER_WEBKITCLIENT_IMPL_H_
 
 #include "third_party/WebKit/WebKit/chromium/public/WebMimeRegistry.h"
 #include "webkit/glue/webkitclient_impl.h"
@@ -54,4 +54,4 @@ class WorkerWebKitClientImpl : public webkit_glue::WebKitClientImpl,
       const WebKit::WebString&);
 };
 
-#endif  // CHROME_WORKER_WORKER_WEBKIT_CLIENT_IMPL_H_
+#endif  // CHROME_WORKER_WORKER_WEBKITCLIENT_IMPL_H_
author	erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>	2009-11-13 19:56:17 +0000
committer	erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>	2009-11-13 19:56:17 +0000
commit	11f48572859aca238afeb436d2504c5ffab49f07 (patch)
tree	1b31af349eb99a9e83716f5add3273b42bee41cf
parent	af530ac147feb1b04446f529daa4cc4448f89b23 (diff)
download	chromium_src-11f48572859aca238afeb436d2504c5ffab49f07.zip chromium_src-11f48572859aca238afeb436d2504c5ffab49f07.tar.gz chromium_src-11f48572859aca238afeb436d2504c5ffab49f07.tar.bz2