Removing useless Win7 checks + standardize its use

chrome/browser/password_manager/password_manager_util_win.cc

 // Copyright 2013 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.
 
 // windows.h must be first otherwise Win8 SDK breaks.
 #include <windows.h>
 #include <LM.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <wincred.h>
 
 #include <memory>
 
 // SECURITY_WIN32 must be defined in order to get
 // EXTENDED_NAME_FORMAT enumeration.
 #define SECURITY_WIN32 1
 #include <security.h>
 #undef SECURITY_WIN32
 
 #include "chrome/browser/password_manager/password_manager_util_win.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/task_scheduler/post_task.h"
 #include "base/time/time.h"
-#include "base/win/windows_version.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/grit/chromium_strings.h"
 #include "components/password_manager/core/browser/password_manager.h"
 #include "components/password_manager/core/common/password_manager_pref_names.h"
 #include "components/prefs/pref_service.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_tree_host.h"
@@ skipping 132 matching lines @@
   WCHAR username[CREDUI_MAX_USERNAME_LENGTH+1] = {};
   *status = PASSWORD_STATUS_UNKNOWN;
 
   if (GetUserNameEx(NameUserPrincipal, username, &username_length)) {
     // If we are on a domain, it is almost certain that the password is not
     // blank, but we do not actively check any further than this to avoid any
     // failed login attempts hitting the domain controller.
     *status = PASSWORD_STATUS_WIN_DOMAIN;
   } else {
     username_length = CREDUI_MAX_USERNAME_LENGTH;
-    // CheckBlankPasswordWithPrefs() isn't safe to call on before Windows 7.
-    // http://crbug.com/345916
-    if (base::win::GetVersion() >= base::win::VERSION_WIN7 &&
-        GetUserName(username, &username_length)) {
+    if (GetUserName(username, &username_length)) {
       *status = CheckBlankPasswordWithPrefs(username, prefs) ?
           PASSWORD_STATUS_BLANK :
           PASSWORD_STATUS_NONBLANK;
     }
   }
 }
 
 void ReplyOsPasswordStatus(std::unique_ptr<PasswordCheckPrefs> prefs,
                            std::unique_ptr<OsPasswordStatus> status) {
   PrefService* local_state = g_browser_process->local_state();
@@ skipping 115 matching lines @@
         }
       }
       SecureZeroMemory(password, sizeof(password));
     }
   } while (credErr == NO_ERROR &&
            (retval == false && tries < kMaxPasswordRetries));
   return retval;
 }
 
 }  // namespace password_manager_util_win