[NTP::SectionOrder] Add EM oriented order.

chrome/browser/about_flags.cc

Index: chrome/browser/about_flags.cc
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 2860a915a2d06a354f05478a02c296eb3c1e47ab..a02cc3e7562f281cf2f27c6c53f3bd57433b6bde 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -498,6 +498,30 @@ const FeatureEntry::Choice kNtpSwitchToExistingTabChoices[] = {
 
 #if defined(OS_ANDROID)
 const FeatureEntry::FeatureParam
+    kContentSuggestionsCategoryOrderFeatureVariationGeneral[] = {
+        {ntp_snippets::kCategoryOrderParameter,
+         ntp_snippets::kCategoryOrderGeneral},
+};
+
+const FeatureEntry::FeatureParam
+    kContentSuggestionsCategoryOrderFeatureVariationEmergingMarketsOriented[] =
+        {

[Marc Treib, 2017/02/13 14:25:22]

Is this "git cl format"ted? Looks weird...

[vitaliii, 2017/02/14 09:32:32]

Yes, it is.
If you write this definition as one line, git cl format produces the code above.

This should be fixed by s/EmergingMarkets/EM mentioned below.

+            {ntp_snippets::kCategoryOrderParameter,
+             ntp_snippets::kCategoryOrderEmergingMarketsOriented},
+};
+
+const FeatureEntry::FeatureVariation
+    kContentSuggestionsCategoryOrderFeatureVariations[] = {
+        {"(general)", kContentSuggestionsCategoryOrderFeatureVariationGeneral,
+         arraysize(kContentSuggestionsCategoryOrderFeatureVariationGeneral),
+         nullptr},
+        {"(emerging markets oriented)",
+         kContentSuggestionsCategoryOrderFeatureVariationEmergingMarketsOriented,
+         arraysize(
+             kContentSuggestionsCategoryOrderFeatureVariationEmergingMarketsOriented),

[vitaliii, 2017/02/13 13:51:57]

Should I replace EmergingMarkets with EM in order to make this line shorter?

[Marc Treib, 2017/02/13 14:25:22]

Sure, why not

[vitaliii, 2017/02/14 09:32:31]

Done.

+         nullptr}};
+
+const FeatureEntry::FeatureParam
     kContentSuggestionsCategoryRankerFeatureVariationConstant[] = {
         {ntp_snippets::kCategoryRankerParameter,
          ntp_snippets::kCategoryRankerConstantRanker},
@@ -1820,6 +1844,16 @@ const FeatureEntry kFeatureEntries[] = {
      SINGLE_VALUE_TYPE(extensions::switches::kDisableTabForDesktopShare)},
 #endif  // ENABLE_EXTENSIONS
 #if defined(OS_ANDROID)
+    // TODO(crbug.com/690450): Use ntp_snippets::kStudyName as a feature trial.

[Marc Treib, 2017/02/13 14:25:22]

FYI: The common format (everywhere except for ios/) is "TODO(ldap)", though
arguably the bug number is more useful than a user name. So.. eh.

nit: s/as a/as the/

[vitaliii, 2017/02/14 09:32:32]

Done. Replaced.

Also moved the bug ling inside the TODO.

+    // Currently only one FEATURE_WITH_VARIATIONS_VALUE_TYPE can be set via
+    // about::flags if they reuse a feature trial.

[Marc Treib, 2017/02/13 14:25:23]

Currently, only a single FEATURE_WITH_VARIATIONS_VALUE_TYPE can use a given
study name.
?
(I'm slightly confused by your formulation)

[vitaliii, 2017/02/14 09:32:32]

Done.

+    {"content-suggestions-category-order",
+     IDS_FLAGS_CONTENT_SUGGESTIONS_CATEGORY_ORDER_NAME,
+     IDS_FLAGS_CONTENT_SUGGESTIONS_CATEGORY_ORDER_DESCRIPTION, kOsAndroid,
+     FEATURE_WITH_VARIATIONS_VALUE_TYPE(
+         ntp_snippets::kCategoryOrder,
+         kContentSuggestionsCategoryOrderFeatureVariations,
+         "content-suggestions-category-order-feature-trial")},
     {"content-suggestions-category-ranker",
      IDS_FLAGS_CONTENT_SUGGESTIONS_CATEGORY_RANKER_NAME,
      IDS_FLAGS_CONTENT_SUGGESTIONS_CATEGORY_RANKER_DESCRIPTION, kOsAndroid,