Enable Popular Sites in Android demo mode.

components/ntp_tiles/android/java/src/org/chromium/components/ntptiles/MostVisitedSites.java

Index: components/ntp_tiles/android/java/src/org/chromium/components/ntptiles/MostVisitedSites.java
diff --git a/components/ntp_tiles/android/java/src/org/chromium/components/ntptiles/MostVisitedSites.java b/components/ntp_tiles/android/java/src/org/chromium/components/ntptiles/MostVisitedSites.java
new file mode 100644
index 0000000000000000000000000000000000000000..3dc3ed73dac134dc9be42e672bf35bc7fb3b9b2a
--- /dev/null
+++ b/components/ntp_tiles/android/java/src/org/chromium/components/ntptiles/MostVisitedSites.java
@@ -0,0 +1,23 @@
+// Copyright 2016 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.
+
+package org.chromium.components.ntptiles;
+
+import org.chromium.base.ApiCompatibilityUtils;
+import org.chromium.base.ContextUtils;
+import org.chromium.base.annotations.CalledByNative;
+
+/**
+ * Utility class containing Android-specific functionality for the native MostVisitedSites.
+ */
+public final class MostVisitedSites {
+
+    private MostVisitedSites() {}
+
+    @CalledByNative
+    private static boolean isPopularSitesEnabled() {

[Marc Treib, 2016/07/22 12:59:03]

As Chris says, this isn't used anywhere.

The name doesn't make it clear if this will be and'ed or or'ed with the other
"enabled" check(s). isPopularSitesForceEnabled maybe?

[sfiera, 2016/07/22 13:01:48]

Or isDemoUser() and let the C++ code figure it out. In the long run, Popular
Sites will be enabled both in and out of demo mode, no?

[Bernhard Bauer, 2016/07/22 14:37:38]

Yes, but all that means is that this will probably be reverted anyway...

[Bernhard Bauer, 2016/07/22 14:37:38]

Done.

+        return ApiCompatibilityUtils.isDemoUser(ContextUtils.getApplicationContext());
+    }
+
+}