A large number of style nits in preparation for turning on automated cpplint.py.

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

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

9 files changed, 13 insertions, 13 deletions

diff --git a/chrome/installer/gcapi/gcapi.cc b/chrome/installer/gcapi/gcapi.cc
index 3f9804e..2f110fc 100644
--- a/chrome/installer/gcapi/gcapi.cc
+++ b/chrome/installer/gcapi/gcapi.cc
@@ -433,7 +433,7 @@ DLLEXPORT BOOL __stdcall LaunchGoogleChromeWithDimensions(int x,
     }
   }
 
-  if(!handle)
+  if (!handle)
     return false;
 
   // At this point, there are several top-level Chrome windows
diff --git a/chrome/installer/setup/uninstall.cc b/chrome/installer/setup/uninstall.cc
index 0ac0f2f..0b9c326 100644
--- a/chrome/installer/setup/uninstall.cc
+++ b/chrome/installer/setup/uninstall.cc
@@ -531,4 +531,4 @@ installer_util::InstallStatus installer_setup::UninstallChrome(
     file_util::Delete(local_state_path, false);
 
   return ret;
-}
\ No newline at end of file
+}
diff --git a/chrome/installer/util/browser_distribution.cc b/chrome/installer/util/browser_distribution.cc
index da796aa..25ed75f 100644
--- a/chrome/installer/util/browser_distribution.cc
+++ b/chrome/installer/util/browser_distribution.cc
@@ -116,4 +116,4 @@ void BrowserDistribution::LaunchUserExperiment(
 
 
 void BrowserDistribution::InactiveUserToastExperiment(int flavor) {
-}
\ No newline at end of file
+}
diff --git a/chrome/installer/util/create_dir_work_item.cc b/chrome/installer/util/create_dir_work_item.cc
index cdc7d3e..3cfd1fb 100644
--- a/chrome/installer/util/create_dir_work_item.cc
+++ b/chrome/installer/util/create_dir_work_item.cc
@@ -55,7 +55,7 @@ void CreateDirWorkItem::Rollback() {
   // along the way.
   FilePath path_to_delete(path_);
 
-  while(1) {
+  while (1) {
     if (file_util::PathExists(path_to_delete)) {
       if (!RemoveDirectory(path_to_delete.value().c_str()))
         break;
diff --git a/chrome/installer/util/create_reg_key_work_item.cc b/chrome/installer/util/create_reg_key_work_item.cc
index a2a526b..221fe7b 100644
--- a/chrome/installer/util/create_reg_key_work_item.cc
+++ b/chrome/installer/util/create_reg_key_work_item.cc
@@ -21,7 +21,7 @@ CreateRegKeyWorkItem::CreateRegKeyWorkItem(HKEY predefined_root,
 }
 
 bool CreateRegKeyWorkItem::Do() {
-  if(!InitKeyList()) {
+  if (!InitKeyList()) {
     // Nothing needs to be done here.
     LOG(INFO) << "no key to create";
     return true;
@@ -35,8 +35,8 @@ bool CreateRegKeyWorkItem::Do() {
     DWORD disposition;
     key_path.assign(key_list_[i - 1]);
 
-    if(key.CreateWithDisposition(predefined_root_, key_path.c_str(),
-                                 &disposition)) {
+    if (key.CreateWithDisposition(predefined_root_, key_path.c_str(),
+                                  &disposition)) {
       if (disposition == REG_OPENED_EXISTING_KEY) {
         if (key_created_) {
           // This should not happen. Someone created a subkey under the key
@@ -47,7 +47,7 @@ bool CreateRegKeyWorkItem::Do() {
         LOG(INFO) << key_path << " exists";
         // Remove the key path from list if it is already present.
         key_list_.pop_back();
-      } else if (disposition == REG_CREATED_NEW_KEY){
+      } else if (disposition == REG_CREATED_NEW_KEY) {
         LOG(INFO) << "created " << key_path;
         key_created_ = true;
       } else {
@@ -99,7 +99,7 @@ bool CreateRegKeyWorkItem::InitKeyList() {
     // This is pure string operation so it does not matter whether the
     // path is file path or registry path.
     file_util::UpOneDirectoryOrEmpty(&key_path);
-  } while(!key_path.empty());
+  } while (!key_path.empty());
 
   return true;
 }
diff --git a/chrome/installer/util/html_dialog_impl.cc b/chrome/installer/util/html_dialog_impl.cc
index f896d0e..96cbc78 100644
--- a/chrome/installer/util/html_dialog_impl.cc
+++ b/chrome/installer/util/html_dialog_impl.cc
@@ -47,7 +47,7 @@ namespace installer {
 
 class HTMLDialogWin : public HTMLDialog {
  public:
-  HTMLDialogWin(const std::wstring& url) : url_(url) {
+  explicit HTMLDialogWin(const std::wstring& url) : url_(url) {
     if (!mshtml_)
        mshtml_ = LoadLibrary(L"MSHTML.DLL");
   }
diff --git a/chrome/installer/util/lzma_util.cc b/chrome/installer/util/lzma_util.cc
index 5208e12..de5f824 100644
--- a/chrome/installer/util/lzma_util.cc
+++ b/chrome/installer/util/lzma_util.cc
@@ -48,7 +48,7 @@ SZ_RESULT SzFileSeekImp(void *object, CFileSize pos) {
   value.LowPart = SetFilePointer(s->File, value.LowPart, &value.HighPart,
                                  FILE_BEGIN);
   if (value.LowPart == 0xFFFFFFFF) {
-    if(GetLastError() != NO_ERROR) {
+    if (GetLastError() != NO_ERROR) {
       return SZE_FAIL;
     }
   }
diff --git a/chrome/installer/util/lzma_util_unittest.cc b/chrome/installer/util/lzma_util_unittest.cc
index 214b5c8..c0a629a 100644
--- a/chrome/installer/util/lzma_util_unittest.cc
+++ b/chrome/installer/util/lzma_util_unittest.cc
@@ -129,4 +129,4 @@ TEST_F(LzmaUtilTest, UnPackArchiveTest) {
   archive = data_dir_.AppendASCII("invalid_archive.7z");
   EXPECT_NE(LzmaUtil::UnPackArchive(archive.value(), extract_dir.value(),
                                     &unpacked_file), NO_ERROR);
-}
\ No newline at end of file
+}
diff --git a/chrome/installer/util/shell_util.cc b/chrome/installer/util/shell_util.cc
index d4f5930..f8022f0 100644
--- a/chrome/installer/util/shell_util.cc
+++ b/chrome/installer/util/shell_util.cc
@@ -526,7 +526,7 @@ bool ShellUtil::GetDesktopPath(bool system_level, std::wstring* path) {
 }
 
 bool ShellUtil::GetQuickLaunchPath(bool system_level, std::wstring* path) {
-  const static wchar_t* kQuickLaunchPath =
+  static const wchar_t* kQuickLaunchPath =
       L"Microsoft\\Internet Explorer\\Quick Launch";
   wchar_t qlaunch[MAX_PATH];
   if (system_level) {