Removing useless Win7 checks + standardize its use

chrome/browser/prefs/incognito_mode_prefs.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/prefs/incognito_mode_prefs.h"
 
 #include <stdint.h>
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 11 matching lines @@
 #include "content/public/browser/browser_thread.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <objbase.h>
 #include <wpcapi.h>
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/memory/singleton.h"
 #include "base/win/scoped_comptr.h"
-#include "base/win/windows_version.h"
 #endif  // OS_WIN
 
 #if defined(OS_ANDROID)
 #include "chrome/browser/android/partner_browser_customizations.h"
 #endif  // defined(OS_ANDROID)
 
 using content::BrowserThread;
 
 #if defined(OS_WIN)
 namespace {
@@ skipping 27 matching lines @@
 
   ~PlatformParentalControlsValue() = default;
 
   // Returns true if Windows Parental control activity logging is enabled. This
   // feature is available on Windows 7 and beyond. This function should be
   // called on a COM Initialized thread and is potentially blocking.
   static bool IsParentalControlActivityLoggingOn() {
     // Since we can potentially block, make sure the thread is okay with this.
     base::ThreadRestrictions::AssertIOAllowed();
 
-    // Query this info on Windows 7 and above.
-    if (base::win::GetVersion() < base::win::VERSION_WIN7)
-      return false;
-
     ThreadType thread_type = ThreadType::BLOCKING;
     if (BrowserThread::IsThreadInitialized(BrowserThread::UI) &&
         content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)) {
       thread_type = ThreadType::UI;
     }
 
     UMA_HISTOGRAM_ENUMERATION(
         "IncognitoModePrefs.WindowsParentalControlsInitThread",
         static_cast<int32_t>(thread_type),
         static_cast<int32_t>(ThreadType::COUNT));
@@ skipping 135 matching lines @@
   bool valid = IntToAvailability(pref_value, &result);
   DCHECK(valid);
   if (result != IncognitoModePrefs::DISABLED &&
       mode == CHECK_PARENTAL_CONTROLS && ArePlatformParentalControlsEnabled()) {
     if (result == IncognitoModePrefs::FORCED)
       LOG(ERROR) << "Ignoring FORCED incognito. Parental control logging on";
     return IncognitoModePrefs::DISABLED;
   }
   return result;
 }