|
@@ -1021,7 +1021,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
|
|
|
|
|
const FeatureEntry::Choice kPassiveListenersChoices[] = {
|
|
const FeatureEntry::Choice kPassiveListenersChoices[] = {
|
|
{flags_ui::kGenericExperimentChoiceDefault, "", ""},
|
|
{flags_ui::kGenericExperimentChoiceDefault, "", ""},
|
|
-@@ -3308,7 +3308,7 @@ const FeatureEntry kFeatureEntries[] = {
|
|
|
|
|
|
+@@ -3324,7 +3324,7 @@ const FeatureEntry kFeatureEntries[] = {
|
|
flag_descriptions::kSyncSandboxDescription, kOsAll,
|
|
flag_descriptions::kSyncSandboxDescription, kOsAll,
|
|
SINGLE_VALUE_TYPE_AND_VALUE(
|
|
SINGLE_VALUE_TYPE_AND_VALUE(
|
|
switches::kSyncServiceURL,
|
|
switches::kSyncServiceURL,
|
|
@@ -1030,7 +1030,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
|
#if !defined(OS_ANDROID)
|
|
#if !defined(OS_ANDROID)
|
|
{"load-media-router-component-extension",
|
|
{"load-media-router-component-extension",
|
|
flag_descriptions::kLoadMediaRouterComponentExtensionName,
|
|
flag_descriptions::kLoadMediaRouterComponentExtensionName,
|
|
-@@ -3558,7 +3558,7 @@ const FeatureEntry kFeatureEntries[] = {
|
|
|
|
|
|
+@@ -3574,7 +3574,7 @@ const FeatureEntry kFeatureEntries[] = {
|
|
flag_descriptions::kSetMarketUrlForTestingName,
|
|
flag_descriptions::kSetMarketUrlForTestingName,
|
|
flag_descriptions::kSetMarketUrlForTestingDescription, kOsAndroid,
|
|
flag_descriptions::kSetMarketUrlForTestingDescription, kOsAndroid,
|
|
SINGLE_VALUE_TYPE_AND_VALUE(switches::kMarketUrlForTesting,
|
|
SINGLE_VALUE_TYPE_AND_VALUE(switches::kMarketUrlForTesting,
|