As YAPS server does not handle affiliation_ids correctly yet, we need to have a flag that would al…

chrome/browser/chromeos/login/users/affiliation.cc

Index: chrome/browser/chromeos/login/users/affiliation.cc
diff --git a/chrome/browser/chromeos/login/users/affiliation.cc b/chrome/browser/chromeos/login/users/affiliation.cc
index 4330afcce50385b6e8af909ace5b4fa60eb4a01d..41b935524cf212f1e3b3ba5deb7a346e7fec378e 100644
--- a/chrome/browser/chromeos/login/users/affiliation.cc
+++ b/chrome/browser/chromeos/login/users/affiliation.cc
@@ -4,7 +4,9 @@
 
 #include "chrome/browser/chromeos/login/users/affiliation.h"
 
+#include "base/command_line.h"
 #include "chrome/browser/chromeos/policy/device_local_account.h"
+#include "components/policy/core/common/policy_switches.h"
 #include "google_apis/gaia/gaia_auth_util.h"
 
 namespace chromeos {
@@ -40,6 +42,12 @@ bool IsUserAffiliated(const AffiliationIDSet& user_affiliation_ids,
     return true;
   }
 
+  // Not all test servers correctly support affiliation ids so far, so

[Andrew T Wilson (Slow), 2016/12/01 09:35:39]

complete comment.

+  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
+  if (command_line->HasSwitch(policy::switches::kUserAlwaysAffiliated)) {
+    return true;
+  }
+
   if (!device_affiliation_ids.empty() && !user_affiliation_ids.empty()) {
     return HaveCommonElement(user_affiliation_ids, device_affiliation_ids);
   }