Fix a whole bunch of style nits.

(Long term intention is to add a subset of cpplint.py to the presubmit script.)

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

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

34 files changed, 331 insertions, 331 deletions

diff --git a/base/condition_variable_unittest.cc b/base/condition_variable_unittest.cc
index c49a8cb..345d141 100644
--- a/base/condition_variable_unittest.cc
+++ b/base/condition_variable_unittest.cc
@@ -229,7 +229,7 @@ TEST_F(ConditionVariableTest, DISABLED_MultiThreadConsumerTest) {
   {
     // Wait until all 10 work tasks have at least been assigned.
     AutoLock auto_lock(*queue.lock());
-    while(queue.task_count())
+    while (queue.task_count())
       queue.no_more_tasks()->Wait();
     // The last of the tasks *might* still be running, but... all but one should
     // be done by now, since tasks are being done serially.
@@ -287,7 +287,7 @@ TEST_F(ConditionVariableTest, DISABLED_MultiThreadConsumerTest) {
   {
     // Wait until all work tasks have at least been assigned.
     AutoLock auto_lock(*queue.lock());
-    while(queue.task_count())
+    while (queue.task_count())
       queue.no_more_tasks()->Wait();
     // Since they can all run almost in parallel, there is no guarantee that all
     // tasks are finished, but we should have gotten here faster than it would
diff --git a/base/debug_on_start.cc b/base/debug_on_start.cc
index 9011ca2..9cabde5 100644
--- a/base/debug_on_start.cc
+++ b/base/debug_on_start.cc
@@ -16,8 +16,7 @@
 // The code is not that bright and will find things like ---argument or
 // /-/argument.
 // Note: command_line is non-destructively modified.
-bool DebugOnStart::FindArgument(wchar_t* command_line, const char* argument_c)
-{
+bool DebugOnStart::FindArgument(wchar_t* command_line, const char* argument_c) {
   wchar_t argument[50];
   for (int i = 0; argument_c[i]; ++i)
     argument[i] = argument_c[i];
diff --git a/base/debug_util_mac.cc b/base/debug_util_mac.cc
index 77ab0ff..78679f2 100644
--- a/base/debug_util_mac.cc
+++ b/base/debug_util_mac.cc
@@ -21,7 +21,7 @@ void DebugUtil::DisableOSCrashDumps() {
   // Apple Crash Reporter handles.  See ux_exception() in xnu's
   // bsd/uxkern/ux_exception.c and machine_exception() in xnu's
   // bsd/dev/*/unix_signal.c.
-  const int signals_to_intercept[] ={
+  const int signals_to_intercept[] = {
     SIGILL,   // EXC_BAD_INSTRUCTION
     SIGTRAP,  // EXC_BREAKPOINT
     SIGFPE,   // EXC_ARITHMETIC
diff --git a/base/debug_util_unittest.cc b/base/debug_util_unittest.cc
index e81b1b7..01551d0 100644
--- a/base/debug_util_unittest.cc
+++ b/base/debug_util_unittest.cc
@@ -28,7 +28,7 @@ TEST(StackTrace, OutputToStream) {
       "Unable to resolve symbols.  Skipping rest of test.";
 
 #if 0
-//TODO(ajwong): Disabling checking of symbol resolution since it depends
+// TODO(ajwong): Disabling checking of symbol resolution since it depends
 //  on whether or not symbols are present, and there are too many
 //  configurations to reliably ensure that symbols are findable.
 #if defined(OS_MACOSX)
diff --git a/base/directory_watcher_unittest.cc b/base/directory_watcher_unittest.cc
index 625c5425..31a0dc4 100644
--- a/base/directory_watcher_unittest.cc
+++ b/base/directory_watcher_unittest.cc
@@ -118,7 +118,7 @@ class DirectoryWatcherTest : public testing::Test {
 
 class TestDelegate : public DirectoryWatcher::Delegate {
  public:
-  TestDelegate(DirectoryWatcherTest* test)
+  explicit TestDelegate(DirectoryWatcherTest* test)
       : test_(test),
         got_notification_(false),
         original_thread_id_(PlatformThread::CurrentId()) {
@@ -309,7 +309,13 @@ TEST_F(DirectoryWatcherTest, MultipleWatchersSingleFile) {
 TEST_F(DirectoryWatcherTest, MultipleWatchersDifferentFiles) {
   const int kNumberOfWatchers = 5;
   DirectoryWatcher watchers[kNumberOfWatchers];
-  TestDelegate delegates[kNumberOfWatchers] = {this, this, this, this, this};
+  TestDelegate delegates[kNumberOfWatchers] = {
+    TestDelegate(this),
+    TestDelegate(this),
+    TestDelegate(this),
+    TestDelegate(this),
+    TestDelegate(this)
+  };
   FilePath subdirs[kNumberOfWatchers];
   for (int i = 0; i < kNumberOfWatchers; i++) {
     subdirs[i] = CreateTestDirDirectoryASCII("Dir" + IntToString(i), false);
diff --git a/chrome/browser/back_forward_menu_model_unittest.cc b/chrome/browser/back_forward_menu_model_unittest.cc
index f967f39..e6532e2 100644
--- a/chrome/browser/back_forward_menu_model_unittest.cc
+++ b/chrome/browser/back_forward_menu_model_unittest.cc
@@ -18,8 +18,8 @@
 
 class BackFwdMenuModelTest : public RenderViewHostTestHarness {
  public:
-   void ValidateModel(BackForwardMenuModel* model, int history_items,
-                      int chapter_stops) {
+  void ValidateModel(BackForwardMenuModel* model, int history_items,
+                     int chapter_stops) {
     int h = std::min(BackForwardMenuModel::kMaxHistoryItems, history_items);
     int c = std::min(BackForwardMenuModel::kMaxChapterStops, chapter_stops);
     EXPECT_EQ(h, model->GetHistoryItemCount());
diff --git a/chrome/browser/browser_focus_uitest.cc b/chrome/browser/browser_focus_uitest.cc
index ec561cb..d9d9ebf 100644
--- a/chrome/browser/browser_focus_uitest.cc
+++ b/chrome/browser/browser_focus_uitest.cc
@@ -214,7 +214,6 @@ class TestInterstitialPage : public InterstitialPage {
   bool waiting_for_dom_response_;
   bool waiting_for_focus_change_;
   std::string dom_response_;
-
 };
 
 }  // namespace
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
index 1102d4a..ce396a3 100644
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -437,8 +437,8 @@ void BrowserProcessImpl::CreateGoogleURLTracker() {
 // which don't do any management.
 template <>
 struct RunnableMethodTraits<BrowserProcessImpl> {
-  void RetainCallee(BrowserProcessImpl*) {}
-  void ReleaseCallee(BrowserProcessImpl*) {}
+  void RetainCallee(BrowserProcessImpl* process) {}
+  void ReleaseCallee(BrowserProcessImpl* process) {}
 };
 
 void BrowserProcessImpl::CheckForInspectorFiles() {
diff --git a/chrome/browser/browser_uitest.cc b/chrome/browser/browser_uitest.cc
index ca70a44..7e03983 100644
--- a/chrome/browser/browser_uitest.cc
+++ b/chrome/browser/browser_uitest.cc
@@ -65,7 +65,6 @@ class BrowserTest : public UITest {
     }
 #endif  // OS_POSIX
   }
-
 };
 
 class VisibleBrowserTest : public UITest {
diff --git a/chrome/browser/browsing_data_remover.cc b/chrome/browser/browsing_data_remover.cc
index 6d70cc9..fb48c53 100644
--- a/chrome/browser/browsing_data_remover.cc
+++ b/chrome/browser/browsing_data_remover.cc
@@ -26,8 +26,8 @@
 // BrowsingDataRemover implement RefCounted.
 template <>
 struct RunnableMethodTraits<BrowsingDataRemover> {
-  void RetainCallee(BrowsingDataRemover*) {}
-  void ReleaseCallee(BrowsingDataRemover*) {}
+  void RetainCallee(BrowsingDataRemover* remover) {}
+  void ReleaseCallee(BrowsingDataRemover* remover) {}
 };
 
 bool BrowsingDataRemover::removing_ = false;
diff --git a/chrome/browser/child_process_security_policy_unittest.cc b/chrome/browser/child_process_security_policy_unittest.cc
index 2cfb489..6dbb5d1 100644
--- a/chrome/browser/child_process_security_policy_unittest.cc
+++ b/chrome/browser/child_process_security_policy_unittest.cc
@@ -13,7 +13,7 @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 class ChildProcessSecurityPolicyTest : public testing::Test {
-protected:
+ protected:
   // testing::Test
   virtual void SetUp() {
     // In the real world, "chrome:" is a handled scheme.
diff --git a/chrome/browser/chrome_plugin_host.cc b/chrome/browser/chrome_plugin_host.cc
index eed0dde..026eaa1 100644
--- a/chrome/browser/chrome_plugin_host.cc
+++ b/chrome/browser/chrome_plugin_host.cc
@@ -101,7 +101,7 @@ class PluginRequestInterceptor
     // poked on a different thread, but never from more than one thread at a
     // time.  We need a way to have the URLRequestJobManager get reset between
     // unit tests.
-    //DCHECK(CalledOnValidThread());
+    // DCHECK(CalledOnValidThread());
 
     if (!IsHandledProtocol(request->url().scheme()))
       return NULL;
@@ -368,8 +368,8 @@ class ModelessHtmlDialogDelegate : public HtmlDialogUIDelegate {
 // when its last InvokeLater is run anyway.
 template <>
 struct RunnableMethodTraits<ModelessHtmlDialogDelegate> {
-  void RetainCallee(ModelessHtmlDialogDelegate*) {}
-  void ReleaseCallee(ModelessHtmlDialogDelegate*) {}
+  void RetainCallee(ModelessHtmlDialogDelegate* delegate) {}
+  void ReleaseCallee(ModelessHtmlDialogDelegate* delegate) {}
 };
 
 namespace {
@@ -755,7 +755,7 @@ CPError STDCALL CPB_OpenFileDialog(CPID id,
   return CPERR_FAILURE;
 }
 
-}
+}  // namespace
 
 CPBrowserFuncs* GetCPBrowserFuncsForBrowser() {
   static CPBrowserFuncs browser_funcs;
diff --git a/chrome/browser/first_run_win.cc b/chrome/browser/first_run_win.cc
index 464ad0d..d329514 100644
--- a/chrome/browser/first_run_win.cc
+++ b/chrome/browser/first_run_win.cc
@@ -689,7 +689,7 @@ const VersionConfig kDialogVersion[] = {
 class TryChromeDialog : public views::ButtonListener,
                         public views::LinkController {
  public:
-  TryChromeDialog(size_t version)
+  explicit TryChromeDialog(size_t version)
       : version_(version),
         popup_(NULL),
         try_chrome_(NULL),
diff --git a/chrome/browser/gears_integration.cc b/chrome/browser/gears_integration.cc
index b6f1d3b..97c7de8 100644
--- a/chrome/browser/gears_integration.cc
+++ b/chrome/browser/gears_integration.cc
@@ -227,8 +227,8 @@ class CreateShortcutCommand : public CPCommandInterface {
 // when its last InvokeLater is run anyway.
 template <>
 struct RunnableMethodTraits<CreateShortcutCommand> {
-  void RetainCallee(CreateShortcutCommand*) {}
-  void ReleaseCallee(CreateShortcutCommand*) {}
+  void RetainCallee(CreateShortcutCommand* command) {}
+  void ReleaseCallee(CreateShortcutCommand* command) {}
 };
 
 void GearsCreateShortcut(
@@ -298,8 +298,8 @@ class QueryShortcutsCommand : public CPCommandInterface {
 // when its last InvokeLater is run anyway.
 template <>
 struct RunnableMethodTraits<QueryShortcutsCommand> {
-  void RetainCallee(QueryShortcutsCommand*) {}
-  void ReleaseCallee(QueryShortcutsCommand*) {}
+  void RetainCallee(QueryShortcutsCommand* command) {}
+  void ReleaseCallee(QueryShortcutsCommand* command) {}
 };
 
 void GearsQueryShortcuts(GearsQueryShortcutsCallback* callback) {
diff --git a/chrome/browser/google_update_settings_posix.cc b/chrome/browser/google_update_settings_posix.cc
index b9c5f85..bc35bbc 100644
--- a/chrome/browser/google_update_settings_posix.cc
+++ b/chrome/browser/google_update_settings_posix.cc
@@ -60,8 +60,7 @@ bool GoogleUpdateSettings::SetCollectStatsConsent(bool consented) {
     }
     const char* c_str = linux_guid.c_str();
     return file_util::WriteFile(consent_file, c_str, kGuidLen) == kGuidLen;
-  }
-  else {
+  } else {
     linux_guid .clear();
     linux_guid.resize(kGuidLen, '0');
     return file_util::Delete(consent_file, false);
diff --git a/chrome/browser/gtk/bookmark_manager_gtk.cc b/chrome/browser/gtk/bookmark_manager_gtk.cc
index 11cc191..96ae1ae 100644
--- a/chrome/browser/gtk/bookmark_manager_gtk.cc
+++ b/chrome/browser/gtk/bookmark_manager_gtk.cc
@@ -805,8 +805,7 @@ bool BookmarkManagerGtk::RecursiveFind(GtkTreeModel* model, GtkTreeIter* iter,
     if (iter->stamp == 0)
       gtk_tree_model_get_iter_first(GTK_TREE_MODEL(left_store_), iter);
     gtk_tree_model_get_value(model, iter, bookmark_utils::ITEM_ID, &value);
-  }
-  else {
+  } else {
     if (iter->stamp == 0)
       gtk_tree_model_get_iter_first(GTK_TREE_MODEL(right_store_), iter);
     gtk_tree_model_get_value(model, iter, RIGHT_PANE_ID, &value);
diff --git a/chrome/browser/gtk/hung_renderer_dialog_gtk.cc b/chrome/browser/gtk/hung_renderer_dialog_gtk.cc
index a687a77..dfd7fc2 100644
--- a/chrome/browser/gtk/hung_renderer_dialog_gtk.cc
+++ b/chrome/browser/gtk/hung_renderer_dialog_gtk.cc
@@ -133,10 +133,10 @@ void HungRendererDialogGtk::Init() {
   GtkTreeViewColumn* column = gtk_tree_view_column_new();
   GtkCellRenderer* renderer = gtk_cell_renderer_pixbuf_new();
   gtk_tree_view_column_pack_start(column, renderer, FALSE);
-  gtk_tree_view_column_add_attribute(column ,renderer, "pixbuf", COL_FAVICON);
+  gtk_tree_view_column_add_attribute(column, renderer, "pixbuf", COL_FAVICON);
   renderer = gtk_cell_renderer_text_new();
   gtk_tree_view_column_pack_start(column, renderer, TRUE);
-  gtk_tree_view_column_add_attribute(column ,renderer, "text", COL_TITLE);
+  gtk_tree_view_column_add_attribute(column, renderer, "text", COL_TITLE);
 
   gtk_tree_view_append_column(GTK_TREE_VIEW(tree_view), column);
   gtk_container_add(GTK_CONTAINER(scroll_list), tree_view);
diff --git a/chrome/browser/gtk/import_dialog_gtk.cc b/chrome/browser/gtk/import_dialog_gtk.cc
index 52f4dc6..9acd79e 100644
--- a/chrome/browser/gtk/import_dialog_gtk.cc
+++ b/chrome/browser/gtk/import_dialog_gtk.cc
@@ -25,8 +25,8 @@ void ImportDialogGtk::ImportComplete() {
   delete this;
 }
 
-ImportDialogGtk::ImportDialogGtk(GtkWindow* parent, Profile* profile) :
-    parent_(parent), profile_(profile), importer_host_(new ImporterHost()) {
+ImportDialogGtk::ImportDialogGtk(GtkWindow* parent, Profile* profile)
+    : parent_(parent), profile_(profile), importer_host_(new ImporterHost()) {
   // Build the dialog.
   dialog_ = gtk_dialog_new_with_buttons(
       l10n_util::GetStringUTF8(IDS_IMPORT_SETTINGS_TITLE).c_str(),
diff --git a/chrome/browser/gtk/infobar_gtk.cc b/chrome/browser/gtk/infobar_gtk.cc
index 1f95e93..ac0a2d5 100644
--- a/chrome/browser/gtk/infobar_gtk.cc
+++ b/chrome/browser/gtk/infobar_gtk.cc
@@ -159,7 +159,7 @@ void InfoBar::OnCloseButton(GtkWidget* button, InfoBar* info_bar) {
 
 class AlertInfoBar : public InfoBar {
  public:
-  AlertInfoBar(AlertInfoBarDelegate* delegate)
+  explicit AlertInfoBar(AlertInfoBarDelegate* delegate)
       : InfoBar(delegate) {
     std::wstring text = delegate->GetMessageText();
     GtkWidget* label = gtk_label_new(WideToUTF8(text).c_str());
@@ -174,7 +174,7 @@ class AlertInfoBar : public InfoBar {
 
 class LinkInfoBar : public InfoBar {
  public:
-  LinkInfoBar(LinkInfoBarDelegate* delegate)
+  explicit LinkInfoBar(LinkInfoBarDelegate* delegate)
       : InfoBar(delegate) {
     size_t link_offset;
     std::wstring display_text =
@@ -239,7 +239,7 @@ class LinkInfoBar : public InfoBar {
 
 class ConfirmInfoBar : public AlertInfoBar {
  public:
-  ConfirmInfoBar(ConfirmInfoBarDelegate* delegate)
+  explicit ConfirmInfoBar(ConfirmInfoBarDelegate* delegate)
       : AlertInfoBar(delegate) {
     AddConfirmButton(ConfirmInfoBarDelegate::BUTTON_CANCEL);
     AddConfirmButton(ConfirmInfoBarDelegate::BUTTON_OK);
diff --git a/chrome/browser/gtk/task_manager_gtk.cc b/chrome/browser/gtk/task_manager_gtk.cc
index bc66dd7..f9010b7 100644
--- a/chrome/browser/gtk/task_manager_gtk.cc
+++ b/chrome/browser/gtk/task_manager_gtk.cc
@@ -16,7 +16,6 @@
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_window.h"
-#include "chrome/browser/gtk/gtk_theme_provider.h"
 #include "chrome/browser/gtk/gtk_chrome_link_button.h"
 #include "chrome/browser/gtk/gtk_theme_provider.h"
 #include "chrome/browser/gtk/menu_gtk.h"
diff --git a/chrome/browser/jsmessage_box_handler.cc b/chrome/browser/jsmessage_box_handler.cc
index 3923646..6ba052f 100644
--- a/chrome/browser/jsmessage_box_handler.cc
+++ b/chrome/browser/jsmessage_box_handler.cc
@@ -58,7 +58,7 @@ std::wstring GetWindowTitle(TabContents* tab_contents, const GURL& frame_url,
       base_address);
 }
 
-}
+}  // namespace
 
 void RunJavascriptMessageBox(TabContents* tab_contents,
                              const GURL& frame_url,
diff --git a/chrome/browser/plugin_carbon_interpose_mac.cc b/chrome/browser/plugin_carbon_interpose_mac.cc
index 0443476..99d2e0f 100644
--- a/chrome/browser/plugin_carbon_interpose_mac.cc
+++ b/chrome/browser/plugin_carbon_interpose_mac.cc
@@ -14,7 +14,7 @@ void NotifyBrowserOfPluginShowWindow(uint32 window_id, CGRect bounds);
 void NotifyBrowserOfPluginHideWindow(uint32 window_id, CGRect bounds);
 void NotifyBrowserOfPluginDisposeWindow(uint32 window_id, CGRect bounds);
 
-}
+}  // namespace webkit_glue
 
 // The process that was frontmost when a plugin created a new window; generally
 // we expect this to be the browser UI process.
diff --git a/chrome/browser/plugin_installer.cc b/chrome/browser/plugin_installer.cc
index 82da4dd..f2859de 100644
--- a/chrome/browser/plugin_installer.cc
+++ b/chrome/browser/plugin_installer.cc
@@ -23,7 +23,7 @@ PluginInstaller::~PluginInstaller() {
 }
 
 void PluginInstaller::OnMissingPluginStatus(int status) {
-  switch(status) {
+  switch (status) {
     case default_plugin::MISSING_PLUGIN_AVAILABLE: {
       tab_contents_->AddInfoBar(this);
       break;
diff --git a/chrome/browser/plugin_service.cc b/chrome/browser/plugin_service.cc
index fe71952..78867e4 100644
--- a/chrome/browser/plugin_service.cc
+++ b/chrome/browser/plugin_service.cc
@@ -217,7 +217,7 @@ void PluginService::Observe(NotificationType type,
       // See: http://code.google.com/p/chromium/issues/detail?id=12306
       Extension* extension = Details<Extension>(details).ptr();
       bool plugins_changed = false;
-      for (size_t i = 0; i < extension->plugins().size(); ++i ) {
+      for (size_t i = 0; i < extension->plugins().size(); ++i) {
         const Extension::PluginInfo& plugin = extension->plugins()[i];
         NPAPI::PluginList::Singleton()->ResetPluginsLoaded();
         NPAPI::PluginList::Singleton()->AddExtraPluginPath(plugin.path);
@@ -233,7 +233,7 @@ void PluginService::Observe(NotificationType type,
     case NotificationType::EXTENSION_UNLOADED: {
       Extension* extension = Details<Extension>(details).ptr();
       bool plugins_changed = false;
-      for (size_t i = 0; i < extension->plugins().size(); ++i ) {
+      for (size_t i = 0; i < extension->plugins().size(); ++i) {
         const Extension::PluginInfo& plugin = extension->plugins()[i];
         NPAPI::PluginList::Singleton()->ResetPluginsLoaded();
         NPAPI::PluginList::Singleton()->RemoveExtraPluginPath(plugin.path);
diff --git a/chrome/browser/process_singleton_linux.cc b/chrome/browser/process_singleton_linux.cc
index 094c86a..677eee3 100644
--- a/chrome/browser/process_singleton_linux.cc
+++ b/chrome/browser/process_singleton_linux.cc
@@ -280,7 +280,7 @@ bool CheckLockHostnameAndCleanup(const std::string& path) {
   int pid;
   ParseLockPath(path, &hostname, &pid);
 
-  if (!hostname.empty() && hostname != net::GetHostName()){
+  if (!hostname.empty() && hostname != net::GetHostName()) {
     DisplayProfileInUseError(path, hostname, pid);
     return false;
   }
diff --git a/chrome/browser/profile_manager_unittest.cc b/chrome/browser/profile_manager_unittest.cc
index b236f67..b4f328ed 100644
--- a/chrome/browser/profile_manager_unittest.cc
+++ b/chrome/browser/profile_manager_unittest.cc
@@ -13,7 +13,7 @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 class ProfileManagerTest : public testing::Test {
-protected:
+ protected:
   virtual void SetUp() {
     // Name a subdirectory of the temp directory.
     ASSERT_TRUE(PathService::Get(base::DIR_TEMP, &test_dir_));
@@ -96,7 +96,7 @@ TEST_F(ProfileManagerTest, DISABLED_CreateAndUseTwoProfiles) {
 
   FilePath dest_path1 = test_dir_;
   dest_path1 = dest_path1.Append(FILE_PATH_LITERAL("New Profile 1"));
-  
+
   FilePath dest_path2 = test_dir_;
   dest_path2 = dest_path2.Append(FILE_PATH_LITERAL("New Profile 2"));
 
diff --git a/chrome/browser/session_startup_pref.cc b/chrome/browser/session_startup_pref.cc
index d14096b..8def8fa 100644
--- a/chrome/browser/session_startup_pref.cc
+++ b/chrome/browser/session_startup_pref.cc
@@ -20,7 +20,7 @@ const int kPrefValueURLs = 4;
 
 // Converts a SessionStartupPref::Type to an integer written to prefs.
 int TypeToPrefValue(SessionStartupPref::Type type) {
-  switch(type) {
+  switch (type) {
     case SessionStartupPref::LAST:   return kPrefValueLast;
     case SessionStartupPref::URLS:   return kPrefValueURLs;
     default:                         return kPrefValueDefault;
@@ -53,7 +53,7 @@ void SessionStartupPref::SetStartupPref(
   SetStartupPref(profile->GetPrefs(), pref);
 }
 
-//static
+// static
 void SessionStartupPref::SetStartupPref(PrefService* prefs,
                                         const SessionStartupPref& pref) {
   DCHECK(prefs);
diff --git a/chrome/browser/shell_integration_linux.cc b/chrome/browser/shell_integration_linux.cc
index fd5ca05..4d6601a 100644
--- a/chrome/browser/shell_integration_linux.cc
+++ b/chrome/browser/shell_integration_linux.cc
@@ -116,7 +116,8 @@ bool GetDesktopShortcutTemplate(std::string* output) {
 
 class CreateDesktopShortcutTask : public Task {
  public:
-  CreateDesktopShortcutTask(const ShellIntegration::ShortcutInfo& shortcut_info)
+  explicit CreateDesktopShortcutTask(
+      const ShellIntegration::ShortcutInfo& shortcut_info)
       : shortcut_info_(shortcut_info) {
   }
 
diff --git a/chrome/browser/spellcheck_unittest.cc b/chrome/browser/spellcheck_unittest.cc
index f1f8387..d328ed6 100644
--- a/chrome/browser/spellcheck_unittest.cc
+++ b/chrome/browser/spellcheck_unittest.cc
@@ -315,287 +315,287 @@ TEST_F(SpellCheckTest, SpellCheckSuggestions_EN_US) {
     // These words come from the wikipedia page of the most commonly
     // misspelled words in english.
     // (http://en.wikipedia.org/wiki/Commonly_misspelled_words).
-    {L"absense", false, 0,0,L"absence"},
-    {L"acceptible", false, 0,0,L"acceptable"},
-    {L"accidentaly", false, 0,0,L"accidentally"},
-    {L"accomodate", false, 0,0,L"accommodate"},
-    {L"acheive", false, 0,0,L"achieve"},
-    {L"acknowlege", false, 0,0,L"acknowledge"},
-    {L"acquaintence", false, 0,0,L"acquaintance"},
-    {L"aquire", false, 0,0,L"acquire"},
-    {L"aquit", false, 0,0,L"acquit"},
-    {L"acrage", false, 0,0,L"acreage"},
-    {L"adress", false, 0,0,L"address"},
-    {L"adultary", false, 0,0,L"adultery"},
-    {L"advertize", false, 0,0,L"advertise"},
-    {L"adviseable", false, 0,0,L"advisable"},
-    {L"agression", false, 0,0,L"aggression"},
-    {L"alchohol", false, 0,0,L"alcohol"},
-    {L"alege", false, 0,0,L"allege"},
-    {L"allegaince", false, 0,0,L"allegiance"},
-    {L"allmost", false, 0,0,L"almost"},
+    {L"absense", false, 0, 0, L"absence"},
+    {L"acceptible", false, 0, 0, L"acceptable"},
+    {L"accidentaly", false, 0, 0, L"accidentally"},
+    {L"accomodate", false, 0, 0, L"accommodate"},
+    {L"acheive", false, 0, 0, L"achieve"},
+    {L"acknowlege", false, 0, 0, L"acknowledge"},
+    {L"acquaintence", false, 0, 0, L"acquaintance"},
+    {L"aquire", false, 0, 0, L"acquire"},
+    {L"aquit", false, 0, 0, L"acquit"},
+    {L"acrage", false, 0, 0, L"acreage"},
+    {L"adress", false, 0, 0, L"address"},
+    {L"adultary", false, 0, 0, L"adultery"},
+    {L"advertize", false, 0, 0, L"advertise"},
+    {L"adviseable", false, 0, 0, L"advisable"},
+    {L"agression", false, 0, 0, L"aggression"},
+    {L"alchohol", false, 0, 0, L"alcohol"},
+    {L"alege", false, 0, 0, L"allege"},
+    {L"allegaince", false, 0, 0, L"allegiance"},
+    {L"allmost", false, 0, 0, L"almost"},
     // Ideally, this test should pass. It works in firefox, but not in hunspell
     // or OS X.
-    // {L"alot", false, 0,0,L"a lot"},
-    {L"amatuer", false, 0,0,L"amateur"},
-    {L"ammend", false, 0,0,L"amend"},
-    {L"amung", false, 0,0,L"among"},
-    {L"anually", false, 0,0,L"annually"},
-    {L"apparant", false, 0,0,L"apparent"},
-    {L"artic", false, 0,0,L"arctic"},
-    {L"arguement", false, 0,0,L"argument"},
-    {L"athiest", false, 0,0,L"atheist"},
-    {L"athelete", false, 0,0,L"athlete"},
-    {L"avrage", false, 0,0,L"average"},
-    {L"awfull", false, 0,0,L"awful"},
-    {L"ballance", false, 0,0,L"balance"},
-    {L"basicly", false, 0,0,L"basically"},
-    {L"becuase", false, 0,0,L"because"},
-    {L"becomeing", false, 0,0,L"becoming"},
-    {L"befor", false, 0,0,L"before"},
-    {L"begining", false, 0,0,L"beginning"},
-    {L"beleive", false, 0,0,L"believe"},
-    {L"bellweather", false, 0,0,L"bellwether"},
-    {L"benifit", false, 0,0,L"benefit"},
-    {L"bouy", false, 0,0,L"buoy"},
-    {L"briliant", false, 0,0,L"brilliant"},
-    {L"burgler", false, 0,0,L"burglar"},
-    {L"camoflage", false, 0,0,L"camouflage"},
-    {L"carrer", false, 0,0,L"career"},
-    {L"carefull", false, 0,0,L"careful"},
-    {L"Carribean", false, 0,0,L"Caribbean"},
-    {L"catagory", false, 0,0,L"category"},
-    {L"cauhgt", false, 0,0,L"caught"},
-    {L"cieling", false, 0,0,L"ceiling"},
-    {L"cemetary", false, 0,0,L"cemetery"},
-    {L"certin", false, 0,0,L"certain"},
-    {L"changable", false, 0,0,L"changeable"},
-    {L"cheif", false, 0,0,L"chief"},
-    {L"citezen", false, 0,0,L"citizen"},
-    {L"collaegue", false, 0,0,L"colleague"},
-    {L"colum", false, 0,0,L"column"},
-    {L"comming", false, 0,0,L"coming"},
-    {L"commited", false, 0,0,L"committed"},
-    {L"compitition", false, 0,0,L"competition"},
-    {L"conceed", false, 0,0,L"concede"},
-    {L"congradulate", false, 0,0,L"congratulate"},
+    // {L"alot", false, 0, 0, L"a lot"},
+    {L"amatuer", false, 0, 0, L"amateur"},
+    {L"ammend", false, 0, 0, L"amend"},
+    {L"amung", false, 0, 0, L"among"},
+    {L"anually", false, 0, 0, L"annually"},
+    {L"apparant", false, 0, 0, L"apparent"},
+    {L"artic", false, 0, 0, L"arctic"},
+    {L"arguement", false, 0, 0, L"argument"},
+    {L"athiest", false, 0, 0, L"atheist"},
+    {L"athelete", false, 0, 0, L"athlete"},
+    {L"avrage", false, 0, 0, L"average"},
+    {L"awfull", false, 0, 0, L"awful"},
+    {L"ballance", false, 0, 0, L"balance"},
+    {L"basicly", false, 0, 0, L"basically"},
+    {L"becuase", false, 0, 0, L"because"},
+    {L"becomeing", false, 0, 0, L"becoming"},
+    {L"befor", false, 0, 0, L"before"},
+    {L"begining", false, 0, 0, L"beginning"},
+    {L"beleive", false, 0, 0, L"believe"},
+    {L"bellweather", false, 0, 0, L"bellwether"},
+    {L"benifit", false, 0, 0, L"benefit"},
+    {L"bouy", false, 0, 0, L"buoy"},
+    {L"briliant", false, 0, 0, L"brilliant"},
+    {L"burgler", false, 0, 0, L"burglar"},
+    {L"camoflage", false, 0, 0, L"camouflage"},
+    {L"carrer", false, 0, 0, L"career"},
+    {L"carefull", false, 0, 0, L"careful"},
+    {L"Carribean", false, 0, 0, L"Caribbean"},
+    {L"catagory", false, 0, 0, L"category"},
+    {L"cauhgt", false, 0, 0, L"caught"},
+    {L"cieling", false, 0, 0, L"ceiling"},
+    {L"cemetary", false, 0, 0, L"cemetery"},
+    {L"certin", false, 0, 0, L"certain"},
+    {L"changable", false, 0, 0, L"changeable"},
+    {L"cheif", false, 0, 0, L"chief"},
+    {L"citezen", false, 0, 0, L"citizen"},
+    {L"collaegue", false, 0, 0, L"colleague"},
+    {L"colum", false, 0, 0, L"column"},
+    {L"comming", false, 0, 0, L"coming"},
+    {L"commited", false, 0, 0, L"committed"},
+    {L"compitition", false, 0, 0, L"competition"},
+    {L"conceed", false, 0, 0, L"concede"},
+    {L"congradulate", false, 0, 0, L"congratulate"},
     {L"consciencious", false, 0, 0, L"conscientious"},
-    {L"concious", false, 0,0,L"conscious"},
-    {L"concensus", false, 0,0,L"consensus"},
-    {L"contraversy", false, 0,0,L"controversy"},
-    {L"conveniance", false, 0,0,L"convenience"},
-    {L"critecize", false, 0,0,L"criticize"},
-    {L"dacquiri", false, 0,0,L"daiquiri"},
-    {L"decieve", false, 0,0,L"deceive"},
-    {L"dicide", false, 0,0,L"decide"},
-    {L"definate", false, 0,0,L"definite"},
-    {L"definitly", false, 0,0,L"definitely"},
-    {L"deposite", false, 0,0,L"deposit"},
-    {L"desparate", false, 0,0,L"desperate"},
-    {L"develope", false, 0,0,L"develop"},
-    {L"diffrence", false, 0,0,L"difference"},
-    {L"dilema", false, 0,0,L"dilemma"},
-    {L"disapear", false, 0,0,L"disappear"},
-    {L"disapoint", false, 0,0,L"disappoint"},
-    {L"disasterous", false, 0,0,L"disastrous"},
-    {L"disipline", false, 0,0,L"discipline"},
-    {L"drunkeness", false, 0,0,L"drunkenness"},
-    {L"dumbell", false, 0,0,L"dumbbell"},
-    {L"durring", false, 0,0,L"during"},
-    {L"easely", false, 0,0,L"easily"},
-    {L"eigth", false, 0,0,L"eight"},
-    {L"embarass", false, 0,0,L"embarrass"},
-    {L"enviroment", false, 0,0,L"environment"},
-    {L"equiped", false, 0,0,L"equipped"},
-    {L"equiptment", false, 0,0,L"equipment"},
-    {L"exagerate", false, 0,0,L"exaggerate"},
-    {L"excede", false, 0,0,L"exceed"},
-    {L"exellent", false, 0,0,L"excellent"},
-    {L"exsept", false, 0,0,L"except"},
-    {L"exercize", false, 0,0,L"exercise"},
-    {L"exilerate", false, 0,0,L"exhilarate"},
-    {L"existance", false, 0,0,L"existence"},
-    {L"experiance", false, 0,0,L"experience"},
-    {L"experament", false, 0,0,L"experiment"},
-    {L"explaination", false, 0,0,L"explanation"},
-    {L"extreem", false, 0,0,L"extreme"},
-    {L"familier", false, 0,0,L"familiar"},
-    {L"facinating", false, 0,0,L"fascinating"},
-    {L"firey", false, 0,0,L"fiery"},
-    {L"finaly", false, 0,0,L"finally"},
-    {L"flourescent", false, 0,0,L"fluorescent"},
-    {L"foriegn", false, 0,0,L"foreign"},
-    {L"fourty", false, 0,0,L"forty"},
-    {L"foreward", false, 0,0,L"forward"},
-    {L"freind", false, 0,0,L"friend"},
-    {L"fullfil", false, 0,0,L"fulfill"},
-    {L"fundemental", false, 0,0,L"fundamental"},
-    {L"guage", false, 0,0,L"gauge"},
-    {L"generaly", false, 0,0,L"generally"},
-    {L"goverment", false, 0,0,L"government"},
-    {L"grammer", false, 0,0,L"grammar"},
-    {L"gratefull", false, 0,0,L"grateful"},
-    {L"garantee", false, 0,0,L"guarantee"},
-    {L"guidence", false, 0,0,L"guidance"},
-    {L"happyness", false, 0,0,L"happiness"},
-    {L"harrass", false, 0,0,L"harass"},
-    {L"heighth", false, 0,0,L"height"},
-    {L"heirarchy", false, 0,0,L"hierarchy"},
-    {L"humerous", false, 0,0,L"humorous"},
-    {L"hygene", false, 0,0,L"hygiene"},
-    {L"hipocrit", false, 0,0,L"hypocrite"},
-    {L"idenity", false, 0,0,L"identity"},
-    {L"ignorence", false, 0,0,L"ignorance"},
-    {L"imaginery", false, 0,0,L"imaginary"},
-    {L"immitate", false, 0,0,L"imitate"},
-    {L"immitation", false, 0,0,L"imitation"},
-    {L"imediately", false, 0,0,L"immediately"},
-    {L"incidently", false, 0,0,L"incidentally"},
-    {L"independant", false, 0,0,L"independent"},
+    {L"concious", false, 0, 0, L"conscious"},
+    {L"concensus", false, 0, 0, L"consensus"},
+    {L"contraversy", false, 0, 0, L"controversy"},
+    {L"conveniance", false, 0, 0, L"convenience"},
+    {L"critecize", false, 0, 0, L"criticize"},
+    {L"dacquiri", false, 0, 0, L"daiquiri"},
+    {L"decieve", false, 0, 0, L"deceive"},
+    {L"dicide", false, 0, 0, L"decide"},
+    {L"definate", false, 0, 0, L"definite"},
+    {L"definitly", false, 0, 0, L"definitely"},
+    {L"deposite", false, 0, 0, L"deposit"},
+    {L"desparate", false, 0, 0, L"desperate"},
+    {L"develope", false, 0, 0, L"develop"},
+    {L"diffrence", false, 0, 0, L"difference"},
+    {L"dilema", false, 0, 0, L"dilemma"},
+    {L"disapear", false, 0, 0, L"disappear"},
+    {L"disapoint", false, 0, 0, L"disappoint"},
+    {L"disasterous", false, 0, 0, L"disastrous"},
+    {L"disipline", false, 0, 0, L"discipline"},
+    {L"drunkeness", false, 0, 0, L"drunkenness"},
+    {L"dumbell", false, 0, 0, L"dumbbell"},
+    {L"durring", false, 0, 0, L"during"},
+    {L"easely", false, 0, 0, L"easily"},
+    {L"eigth", false, 0, 0, L"eight"},
+    {L"embarass", false, 0, 0, L"embarrass"},
+    {L"enviroment", false, 0, 0, L"environment"},
+    {L"equiped", false, 0, 0, L"equipped"},
+    {L"equiptment", false, 0, 0, L"equipment"},
+    {L"exagerate", false, 0, 0, L"exaggerate"},
+    {L"excede", false, 0, 0, L"exceed"},
+    {L"exellent", false, 0, 0, L"excellent"},
+    {L"exsept", false, 0, 0, L"except"},
+    {L"exercize", false, 0, 0, L"exercise"},
+    {L"exilerate", false, 0, 0, L"exhilarate"},
+    {L"existance", false, 0, 0, L"existence"},
+    {L"experiance", false, 0, 0, L"experience"},
+    {L"experament", false, 0, 0, L"experiment"},
+    {L"explaination", false, 0, 0, L"explanation"},
+    {L"extreem", false, 0, 0, L"extreme"},
+    {L"familier", false, 0, 0, L"familiar"},
+    {L"facinating", false, 0, 0, L"fascinating"},
+    {L"firey", false, 0, 0, L"fiery"},
+    {L"finaly", false, 0, 0, L"finally"},
+    {L"flourescent", false, 0, 0, L"fluorescent"},
+    {L"foriegn", false, 0, 0, L"foreign"},
+    {L"fourty", false, 0, 0, L"forty"},
+    {L"foreward", false, 0, 0, L"forward"},
+    {L"freind", false, 0, 0, L"friend"},
+    {L"fullfil", false, 0, 0, L"fulfill"},
+    {L"fundemental", false, 0, 0, L"fundamental"},
+    {L"guage", false, 0, 0, L"gauge"},
+    {L"generaly", false, 0, 0, L"generally"},
+    {L"goverment", false, 0, 0, L"government"},
+    {L"grammer", false, 0, 0, L"grammar"},
+    {L"gratefull", false, 0, 0, L"grateful"},
+    {L"garantee", false, 0, 0, L"guarantee"},
+    {L"guidence", false, 0, 0, L"guidance"},
+    {L"happyness", false, 0, 0, L"happiness"},
+    {L"harrass", false, 0, 0, L"harass"},
+    {L"heighth", false, 0, 0, L"height"},
+    {L"heirarchy", false, 0, 0, L"hierarchy"},
+    {L"humerous", false, 0, 0, L"humorous"},
+    {L"hygene", false, 0, 0, L"hygiene"},
+    {L"hipocrit", false, 0, 0, L"hypocrite"},
+    {L"idenity", false, 0, 0, L"identity"},
+    {L"ignorence", false, 0, 0, L"ignorance"},
+    {L"imaginery", false, 0, 0, L"imaginary"},
+    {L"immitate", false, 0, 0, L"imitate"},
+    {L"immitation", false, 0, 0, L"imitation"},
+    {L"imediately", false, 0, 0, L"immediately"},
+    {L"incidently", false, 0, 0, L"incidentally"},
+    {L"independant", false, 0, 0, L"independent"},
     {L"indispensible", false, 0, 0, L"indispensable"},
-    {L"innoculate", false, 0,0,L"inoculate"},
-    {L"inteligence", false, 0,0,L"intelligence"},
-    {L"intresting", false, 0,0,L"interesting"},
-    {L"interuption", false, 0,0,L"interruption"},
-    {L"irrelevent", false, 0,0,L"irrelevant"},
-    {L"irritible", false, 0,0,L"irritable"},
-    {L"iland", false, 0,0,L"island"},
-    {L"jellous", false, 0,0,L"jealous"},
-    {L"knowlege", false, 0,0,L"knowledge"},
-    {L"labratory", false, 0,0,L"laboratory"},
-    {L"liesure", false, 0,0,L"leisure"},
-    {L"lenght", false, 0,0,L"length"},
-    {L"liason", false, 0,0,L"liaison"},
-    {L"libary", false, 0,0,L"library"},
-    {L"lisence", false, 0,0,L"license"},
-    {L"lonelyness", false, 0,0,L"loneliness"},
-    {L"lieing", false, 0,0,L"lying"},
-    {L"maintenence", false, 0,0,L"maintenance"},
-    {L"manuever", false, 0,0,L"maneuver"},
-    {L"marrige", false, 0,0,L"marriage"},
-    {L"mathmatics", false, 0,0,L"mathematics"},
-    {L"medcine", false, 0,0,L"medicine"},
-    {L"medeval", false, 0,0,L"medieval"},
-    {L"momento", false, 0,0,L"memento"},
-    {L"millenium", false, 0,0,L"millennium"},
-    {L"miniture", false, 0,0,L"miniature"},
-    {L"minite", false, 0,0,L"minute"},
-    {L"mischevous", false, 0,0,L"mischievous"},
-    {L"mispell", false, 0,0,L"misspell"},
+    {L"innoculate", false, 0, 0, L"inoculate"},
+    {L"inteligence", false, 0, 0, L"intelligence"},
+    {L"intresting", false, 0, 0, L"interesting"},
+    {L"interuption", false, 0, 0, L"interruption"},
+    {L"irrelevent", false, 0, 0, L"irrelevant"},
+    {L"irritible", false, 0, 0, L"irritable"},
+    {L"iland", false, 0, 0, L"island"},
+    {L"jellous", false, 0, 0, L"jealous"},
+    {L"knowlege", false, 0, 0, L"knowledge"},
+    {L"labratory", false, 0, 0, L"laboratory"},
+    {L"liesure", false, 0, 0, L"leisure"},
+    {L"lenght", false, 0, 0, L"length"},
+    {L"liason", false, 0, 0, L"liaison"},
+    {L"libary", false, 0, 0, L"library"},
+    {L"lisence", false, 0, 0, L"license"},
+    {L"lonelyness", false, 0, 0, L"loneliness"},
+    {L"lieing", false, 0, 0, L"lying"},
+    {L"maintenence", false, 0, 0, L"maintenance"},
+    {L"manuever", false, 0, 0, L"maneuver"},
+    {L"marrige", false, 0, 0, L"marriage"},
+    {L"mathmatics", false, 0, 0, L"mathematics"},
+    {L"medcine", false, 0, 0, L"medicine"},
+    {L"medeval", false, 0, 0, L"medieval"},
+    {L"momento", false, 0, 0, L"memento"},
+    {L"millenium", false, 0, 0, L"millennium"},
+    {L"miniture", false, 0, 0, L"miniature"},
+    {L"minite", false, 0, 0, L"minute"},
+    {L"mischevous", false, 0, 0, L"mischievous"},
+    {L"mispell", false, 0, 0, L"misspell"},
     // Maybe this one should pass, as it works in hunspell, but not in firefox.
-    // {L"misterius", false, 0,0,L"mysterious"},
-    {L"naturaly", false, 0,0,L"naturally"},
-    {L"neccessary", false, 0,0,L"necessary"},
-    {L"neice", false, 0,0,L"niece"},
-    {L"nieghbor", false, 0,0,L"neighbor"},
-    {L"nieghbour", false, 0,0,L"neighbor"},
-    {L"niether", false, 0,0,L"neither"},
-    {L"noticable", false, 0,0,L"noticeable"},
-    {L"occassion", false, 0,0,L"occasion"},
-    {L"occasionaly", false, 0,0,L"occasionally"},
-    {L"occurrance", false, 0,0,L"occurrence"},
-    {L"occured", false, 0,0,L"occurred"},
-    {L"oficial", false, 0,0,L"official"},
-    {L"offen", false, 0,0,L"often"},
-    {L"ommision", false, 0,0,L"omission"},
-    {L"oprate", false, 0,0,L"operate"},
-    {L"oppurtunity", false, 0,0,L"opportunity"},
-    {L"orignal", false, 0,0,L"original"},
-    {L"outragous", false, 0,0,L"outrageous"},
-    {L"parrallel", false, 0,0,L"parallel"},
-    {L"parliment", false, 0,0,L"parliament"},
-    {L"particurly", false, 0,0,L"particularly"},
-    {L"passtime", false, 0,0,L"pastime"},
-    {L"peculier", false, 0,0,L"peculiar"},
-    {L"percieve", false, 0,0,L"perceive"},
-    {L"pernament", false, 0,0,L"permanent"},
-    {L"perseverence", false, 0,0,L"perseverance"},
-    {L"personaly", false, 0,0,L"personally"},
-    {L"personell", false, 0,0,L"personnel"},
-    {L"persaude", false, 0,0,L"persuade"},
-    {L"pichure", false, 0,0,L"picture"},
-    {L"peice", false, 0,0,L"piece"},
-    {L"plagerize", false, 0,0,L"plagiarize"},
-    {L"playright", false, 0,0,L"playwright"},
-    {L"plesant", false, 0,0,L"pleasant"},
-    {L"pollitical", false, 0,0,L"political"},
-    {L"posession", false, 0,0,L"possession"},
-    {L"potatos", false, 0,0,L"potatoes"},
-    {L"practicle", false, 0,0,L"practical"},
-    {L"preceed", false, 0,0,L"precede"},
-    {L"predjudice", false, 0,0,L"prejudice"},
-    {L"presance", false, 0,0,L"presence"},
-    {L"privelege", false, 0,0,L"privilege"},
+    // {L"misterius", false, 0, 0, L"mysterious"},
+    {L"naturaly", false, 0, 0, L"naturally"},
+    {L"neccessary", false, 0, 0, L"necessary"},
+    {L"neice", false, 0, 0, L"niece"},
+    {L"nieghbor", false, 0, 0, L"neighbor"},
+    {L"nieghbour", false, 0, 0, L"neighbor"},
+    {L"niether", false, 0, 0, L"neither"},
+    {L"noticable", false, 0, 0, L"noticeable"},
+    {L"occassion", false, 0, 0, L"occasion"},
+    {L"occasionaly", false, 0, 0, L"occasionally"},
+    {L"occurrance", false, 0, 0, L"occurrence"},
+    {L"occured", false, 0, 0, L"occurred"},
+    {L"oficial", false, 0, 0, L"official"},
+    {L"offen", false, 0, 0, L"often"},
+    {L"ommision", false, 0, 0, L"omission"},
+    {L"oprate", false, 0, 0, L"operate"},
+    {L"oppurtunity", false, 0, 0, L"opportunity"},
+    {L"orignal", false, 0, 0, L"original"},
+    {L"outragous", false, 0, 0, L"outrageous"},
+    {L"parrallel", false, 0, 0, L"parallel"},
+    {L"parliment", false, 0, 0, L"parliament"},
+    {L"particurly", false, 0, 0, L"particularly"},
+    {L"passtime", false, 0, 0, L"pastime"},
+    {L"peculier", false, 0, 0, L"peculiar"},
+    {L"percieve", false, 0, 0, L"perceive"},
+    {L"pernament", false, 0, 0, L"permanent"},
+    {L"perseverence", false, 0, 0, L"perseverance"},
+    {L"personaly", false, 0, 0, L"personally"},
+    {L"personell", false, 0, 0, L"personnel"},
+    {L"persaude", false, 0, 0, L"persuade"},
+    {L"pichure", false, 0, 0, L"picture"},
+    {L"peice", false, 0, 0, L"piece"},
+    {L"plagerize", false, 0, 0, L"plagiarize"},
+    {L"playright", false, 0, 0, L"playwright"},
+    {L"plesant", false, 0, 0, L"pleasant"},
+    {L"pollitical", false, 0, 0, L"political"},
+    {L"posession", false, 0, 0, L"possession"},
+    {L"potatos", false, 0, 0, L"potatoes"},
+    {L"practicle", false, 0, 0, L"practical"},
+    {L"preceed", false, 0, 0, L"precede"},
+    {L"predjudice", false, 0, 0, L"prejudice"},
+    {L"presance", false, 0, 0, L"presence"},
+    {L"privelege", false, 0, 0, L"privilege"},
     // This one should probably work. It does in FF and Hunspell.
-    // {L"probly", false, 0,0,L"probably"},
-    {L"proffesional", false, 0,0,L"professional"},
-    {L"professer", false, 0,0,L"professor"},
-    {L"promiss", false, 0,0,L"promise"},
+    // {L"probly", false, 0, 0, L"probably"},
+    {L"proffesional", false, 0, 0, L"professional"},
+    {L"professer", false, 0, 0, L"professor"},
+    {L"promiss", false, 0, 0, L"promise"},
     {L"pronounciation", false, 0, 0, L"pronunciation"},
-    {L"prufe", false, 0,0,L"proof"},
-    {L"psycology", false, 0,0,L"psychology"},
-    {L"publically", false, 0,0,L"publicly"},
-    {L"quanity", false, 0,0,L"quantity"},
-    {L"quarentine", false, 0,0,L"quarantine"},
-    {L"questionaire", false, 0,0,L"questionnaire"},
-    {L"readible", false, 0,0,L"readable"},
-    {L"realy", false, 0,0,L"really"},
-    {L"recieve", false, 0,0,L"receive"},
-    {L"reciept", false, 0,0,L"receipt"},
-    {L"reconize", false, 0,0,L"recognize"},
-    {L"recomend", false, 0,0,L"recommend"},
-    {L"refered", false, 0,0,L"referred"},
-    {L"referance", false, 0,0,L"reference"},
-    {L"relevent", false, 0,0,L"relevant"},
-    {L"religous", false, 0,0,L"religious"},
-    {L"repitition", false, 0,0,L"repetition"},
-    {L"restarant", false, 0,0,L"restaurant"},
-    {L"rythm", false, 0,0,L"rhythm"},
-    {L"rediculous", false, 0,0,L"ridiculous"},
-    {L"sacrefice", false, 0,0,L"sacrifice"},
-    {L"saftey", false, 0,0,L"safety"},
-    {L"sissors", false, 0,0,L"scissors"},
-    {L"secratary", false, 0,0,L"secretary"},
-    {L"sieze", false, 0,0,L"seize"},
-    {L"seperate", false, 0,0,L"separate"},
-    {L"sargent", false, 0,0,L"sergeant"},
-    {L"shineing", false, 0,0,L"shining"},
-    {L"similer", false, 0,0,L"similar"},
-    {L"sinceerly", false, 0,0,L"sincerely"},
-    {L"speach", false, 0,0,L"speech"},
-    {L"stoping", false, 0,0,L"stopping"},
-    {L"strenght", false, 0,0,L"strength"},
-    {L"succede", false, 0,0,L"succeed"},
-    {L"succesful", false, 0,0,L"successful"},
-    {L"supercede", false, 0,0,L"supersede"},
-    {L"surelly", false, 0,0,L"surely"},
-    {L"suprise", false, 0,0,L"surprise"},
-    {L"temperture", false, 0,0,L"temperature"},
-    {L"temprary", false, 0,0,L"temporary"},
-    {L"tomatos", false, 0,0,L"tomatoes"},
-    {L"tommorrow", false, 0,0,L"tomorrow"},
-    {L"tounge", false, 0,0,L"tongue"},
-    {L"truely", false, 0,0,L"truly"},
-    {L"twelth", false, 0,0,L"twelfth"},
-    {L"tyrany", false, 0,0,L"tyranny"},
-    {L"underate", false, 0,0,L"underrate"},
-    {L"untill", false, 0,0,L"until"},
-    {L"unuseual", false, 0,0,L"unusual"},
-    {L"upholstry", false, 0,0,L"upholstery"},
-    {L"usible", false, 0,0,L"usable"},
-    {L"useing", false, 0,0,L"using"},
-    {L"usualy", false, 0,0,L"usually"},
-    {L"vaccuum", false, 0,0,L"vacuum"},
-    {L"vegatarian", false, 0,0,L"vegetarian"},
-    {L"vehical", false, 0,0,L"vehicle"},
-    {L"visious", false, 0,0,L"vicious"},
-    {L"villege", false, 0,0,L"village"},
-    {L"wierd", false, 0,0,L"weird"},
-    {L"wellcome", false, 0,0,L"welcome"},
-    {L"wellfare", false, 0,0,L"welfare"},
-    {L"wilfull", false, 0,0,L"willful"},
-    {L"withold", false, 0,0,L"withhold"},
-    {L"writting", false, 0,0,L"writing"},
+    {L"prufe", false, 0, 0, L"proof"},
+    {L"psycology", false, 0, 0, L"psychology"},
+    {L"publically", false, 0, 0, L"publicly"},
+    {L"quanity", false, 0, 0, L"quantity"},
+    {L"quarentine", false, 0, 0, L"quarantine"},
+    {L"questionaire", false, 0, 0, L"questionnaire"},
+    {L"readible", false, 0, 0, L"readable"},
+    {L"realy", false, 0, 0, L"really"},
+    {L"recieve", false, 0, 0, L"receive"},
+    {L"reciept", false, 0, 0, L"receipt"},
+    {L"reconize", false, 0, 0, L"recognize"},
+    {L"recomend", false, 0, 0, L"recommend"},
+    {L"refered", false, 0, 0, L"referred"},
+    {L"referance", false, 0, 0, L"reference"},
+    {L"relevent", false, 0, 0, L"relevant"},
+    {L"religous", false, 0, 0, L"religious"},
+    {L"repitition", false, 0, 0, L"repetition"},
+    {L"restarant", false, 0, 0, L"restaurant"},
+    {L"rythm", false, 0, 0, L"rhythm"},
+    {L"rediculous", false, 0, 0, L"ridiculous"},
+    {L"sacrefice", false, 0, 0, L"sacrifice"},
+    {L"saftey", false, 0, 0, L"safety"},
+    {L"sissors", false, 0, 0, L"scissors"},
+    {L"secratary", false, 0, 0, L"secretary"},
+    {L"sieze", false, 0, 0, L"seize"},
+    {L"seperate", false, 0, 0, L"separate"},
+    {L"sargent", false, 0, 0, L"sergeant"},
+    {L"shineing", false, 0, 0, L"shining"},
+    {L"similer", false, 0, 0, L"similar"},
+    {L"sinceerly", false, 0, 0, L"sincerely"},
+    {L"speach", false, 0, 0, L"speech"},
+    {L"stoping", false, 0, 0, L"stopping"},
+    {L"strenght", false, 0, 0, L"strength"},
+    {L"succede", false, 0, 0, L"succeed"},
+    {L"succesful", false, 0, 0, L"successful"},
+    {L"supercede", false, 0, 0, L"supersede"},
+    {L"surelly", false, 0, 0, L"surely"},
+    {L"suprise", false, 0, 0, L"surprise"},
+    {L"temperture", false, 0, 0, L"temperature"},
+    {L"temprary", false, 0, 0, L"temporary"},
+    {L"tomatos", false, 0, 0, L"tomatoes"},
+    {L"tommorrow", false, 0, 0, L"tomorrow"},
+    {L"tounge", false, 0, 0, L"tongue"},
+    {L"truely", false, 0, 0, L"truly"},
+    {L"twelth", false, 0, 0, L"twelfth"},
+    {L"tyrany", false, 0, 0, L"tyranny"},
+    {L"underate", false, 0, 0, L"underrate"},
+    {L"untill", false, 0, 0, L"until"},
+    {L"unuseual", false, 0, 0, L"unusual"},
+    {L"upholstry", false, 0, 0, L"upholstery"},
+    {L"usible", false, 0, 0, L"usable"},
+    {L"useing", false, 0, 0, L"using"},
+    {L"usualy", false, 0, 0, L"usually"},
+    {L"vaccuum", false, 0, 0, L"vacuum"},
+    {L"vegatarian", false, 0, 0, L"vegetarian"},
+    {L"vehical", false, 0, 0, L"vehicle"},
+    {L"visious", false, 0, 0, L"vicious"},
+    {L"villege", false, 0, 0, L"village"},
+    {L"wierd", false, 0, 0, L"weird"},
+    {L"wellcome", false, 0, 0, L"welcome"},
+    {L"wellfare", false, 0, 0, L"welfare"},
+    {L"wilfull", false, 0, 0, L"willful"},
+    {L"withold", false, 0, 0, L"withhold"},
+    {L"writting", false, 0, 0, L"writing"},
 #else
     {L"ello", false, 0, 0, L"hello"},
     {L"ello", false, 0, 0, L"cello"},
@@ -1100,9 +1100,9 @@ TEST_F(SpellCheckTest, IgnoreWords_EN_US) {
     const wchar_t* input;
     bool input_result;
     } kTestCases[] = {
-    {L"teh",false},
+    {L"teh", false},
     {L"moer", false},
-    {L"watre",false},
+    {L"watre", false},
     {L"noen", false},
     };
 
diff --git a/chrome/browser/task_manager.cc b/chrome/browser/task_manager.cc
index 5e019b8..d74fa79 100644
--- a/chrome/browser/task_manager.cc
+++ b/chrome/browser/task_manager.cc
@@ -48,7 +48,7 @@ std::wstring FormatStatsSize(const WebKit::WebCache::ResourceTypeStat& stat) {
       FormatBytes(stat.liveSize, DATA_UNITS_KILOBYTE, false));
 }
 
-}
+}  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // TaskManagerModel class
diff --git a/chrome/browser/thumbnail_store_unittest.cc b/chrome/browser/thumbnail_store_unittest.cc
index e5a5be0..089f84e 100644
--- a/chrome/browser/thumbnail_store_unittest.cc
+++ b/chrome/browser/thumbnail_store_unittest.cc
@@ -87,7 +87,7 @@ void ThumbnailStoreTest::SetUp() {
   SkAutoLockPixels lock2(*weewar_);
   jpeg_weewar_ = new RefCountedBytes;
   gfx::JPEGCodec::Encode(
-      reinterpret_cast<unsigned char*>(weewar_->getAddr32(0,0)),
+      reinterpret_cast<unsigned char*>(weewar_->getAddr32(0, 0)),
       gfx::JPEGCodec::FORMAT_BGRA, weewar_->width(),
       weewar_->height(),
       static_cast<int>(weewar_->rowBytes()), 90,
diff --git a/chrome/browser/utility_process_host_unittest.cc b/chrome/browser/utility_process_host_unittest.cc
index f901a9a..ffb99a7 100644
--- a/chrome/browser/utility_process_host_unittest.cc
+++ b/chrome/browser/utility_process_host_unittest.cc
@@ -93,7 +93,7 @@ class TestUtilityProcessHost : public UtilityProcessHost {
 
 class ProcessClosedObserver : public NotificationObserver {
  public:
-  ProcessClosedObserver(MessageLoop* message_loop)
+  explicit ProcessClosedObserver(MessageLoop* message_loop)
       : message_loop_(message_loop) {
     registrar_.Add(this, NotificationType::CHILD_PROCESS_HOST_DISCONNECTED,
                    NotificationService::AllSources());
diff --git a/chrome/browser/visitedlink_perftest.cc b/chrome/browser/visitedlink_perftest.cc
index 295d8dc..b38a953 100644
--- a/chrome/browser/visitedlink_perftest.cc
+++ b/chrome/browser/visitedlink_perftest.cc
@@ -151,8 +151,7 @@ TEST_F(VisitedLink, TestLoad) {
   const int load_count = 5;
   std::vector<double> cold_load_times;
   std::vector<double> hot_load_times;
-  for (int i = 0; i < load_count; i++)
-  {
+  for (int i = 0; i < load_count; i++) {
     // make sure the file has to be re-loaded
     file_util::EvictFileFromSystemCache(
         FilePath::FromWStringHack(std::wstring(db_name_)));
diff --git a/chrome/browser/window_sizer_linux.cc b/chrome/browser/window_sizer_linux.cc
index 5be1e57..9bdcd98 100644
--- a/chrome/browser/window_sizer_linux.cc
+++ b/chrome/browser/window_sizer_linux.cc
@@ -12,7 +12,7 @@
 #include "chrome/browser/browser_window.h"
 
 // Used to pad the default new window size.  On Windows, this is also used for
-// positioning new windows (each window is offset from the previous one). 
+// positioning new windows (each window is offset from the previous one).
 // Since we don't position windows, it's only used for the default new window
 // size.
 const int WindowSizer::kWindowTilePixels = 10;