Use IsOS(OS_DOMAINMEMBER) to Check for Domain Membership

base/win/win_util.cc

Index: base/win/win_util.cc
diff --git a/base/win/win_util.cc b/base/win/win_util.cc
index e0d0de1b418866d960598d3f983fb4e24b5df298..802c9e6a14d5a016fee700aa3e20f240ffb21ecf 100644
--- a/base/win/win_util.cc
+++ b/base/win/win_util.cc
@@ -6,7 +6,6 @@
 
 #include <aclapi.h>
 #include <cfgmgr32.h>
-#include <lm.h>
 #include <powrprof.h>
 #include <shobjidl.h>  // Must be before propkey.
 #include <initguid.h>
@@ -17,6 +16,7 @@
 #include <roapi.h>
 #include <sddl.h>
 #include <setupapi.h>
+#include <shlwapi.h>
 #include <signal.h>
 #include <stddef.h>
 #include <stdlib.h>
@@ -518,20 +518,15 @@ bool IsTabletDevice(std::string* reason) {
   return is_tablet;
 }
 
-enum DomainEnrollementState {UNKNOWN = -1, NOT_ENROLLED, ENROLLED};
+enum DomainEnrollmentState {UNKNOWN = -1, NOT_ENROLLED, ENROLLED};
 static volatile long int g_domain_state = UNKNOWN;
 
 bool IsEnrolledToDomain() {
   // Doesn't make any sense to retry inside a user session because joining a
   // domain will only kick in on a restart.
   if (g_domain_state == UNKNOWN) {
-    LPWSTR domain;
-    NETSETUP_JOIN_STATUS join_status;
-    if(::NetGetJoinInformation(NULL, &domain, &join_status) != NERR_Success)

[scottmg, 2016/06/09 17:12:14]

From a quick skim, it looks like we could remove netapi32.lib from the libs in
base/BUILD.gn if this is removed.

[robliao, 2016/06/09 18:51:52]

Yep. Removed 1/4 instances.

The remaining 3...
chrome/browser/BUILD.gn needs it for  password_manager_util_win (NetUserGetInfo)
components/policy/core/common/BUILD.gn is doing a domain check of its own and
should probably start using the base version. That's a separate CL entirely.
build/common.gypi: Consumed by the policy build (same as
components/policy/core/common/BUILD.gn)

-      return false;
-    ::NetApiBufferFree(domain);
     ::InterlockedCompareExchange(&g_domain_state,
-                                 join_status == ::NetSetupDomainName ?
+                                 !!IsOS(OS_DOMAINMEMBER) ?

[grt (UTC plus 2), 2016/06/09 16:51:41]

is there a benefit to doing this? is there a gain in switching to a function in
shlwapi.dll?

[robliao, 2016/06/09 16:56:10]

This way, MS maintains the code necessary to check for domain membership. We
don't need to maintain the same code on our side if anything changes.

                                      ENROLLED : NOT_ENROLLED,
                                  UNKNOWN);
   }