Re-enable child account detection, now behind a flag.

chrome/browser/about_flags.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/about_flags.h"
 
 #include <iterator>
 #include <map>
 #include <set>
 #include <utility>
@@ skipping 2174 matching lines @@
   },
   {
     "use-sync-sandbox",
     IDS_FLAGS_SYNC_SANDBOX_NAME,
     IDS_FLAGS_SYNC_SANDBOX_DESCRIPTION,
     kOsAll,
     SINGLE_VALUE_TYPE_AND_VALUE(
         switches::kSyncServiceURL,
         "https://chrome-sync.sandbox.google.com/chrome-sync/alpha")
   },
+  {
+    "enable-child-account-detection",
+    IDS_FLAGS_CHILD_ACCOUNT_DETECTION_NAME,
+    IDS_FLAGS_CHILD_ACCOUNT_DETECTION_DESCRIPTION,
+    kOsMac | kOsWin | kOsLinux | kOsCrOS,

[Bernhard Bauer, 2015/03/09 11:08:53]

For consistency, we should probably add the flag on Android as well.

[Marc Treib, 2015/03/09 11:20:12]

But for now, it won't do anything on Android (right?)
Can you create a downstream CL to honor the flag an Android as well, or should I
look into it?

[Bernhard Bauer, 2015/03/09 14:02:51]

That code is upstreamed now! :) The logic is in Java code though. If you want to
implement that, go ahead, if not, I can do it as well.

[Marc Treib, 2015/03/09 14:48:02]

Right, awesome :)
Done!

+    ENABLE_DISABLE_VALUE_TYPE(switches::kEnableChildAccountDetection,
+                              switches::kDisableChildAccountDetection)
+  },
 
   // NOTE: Adding new command-line switches requires adding corresponding
   // entries to enum "LoginCustomFlags" in histograms.xml. See note in
   // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test.
 };
 
 const Experiment* experiments = kExperiments;
 size_t num_experiments = arraysize(kExperiments);
 
 // Stores and encapsulates the little state that about:flags has.
@@ skipping 583 matching lines @@
 }
 
 const Experiment* GetExperiments(size_t* count) {
   *count = num_experiments;
   return experiments;
 }
 
 }  // namespace testing
 
 }  // namespace about_flags