| Index: chrome/browser/about_flags.cc
|
| diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
| index 8881c9949c4104aa08c20ead636a1009a1ce48b6..39e61c626a7a1b957c3f6d81e05251f5699fb984 100644
|
| --- a/chrome/browser/about_flags.cc
|
| +++ b/chrome/browser/about_flags.cc
|
| @@ -305,12 +305,12 @@ const Experiment::Choice kOverlayScrollbarChoices[] = {
|
| };
|
| #endif
|
|
|
| -const Experiment::Choice kZeroCopyChoices[] = {
|
| +const Experiment::Choice kOneCopyChoices[] = {
|
| { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
|
| { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED,
|
| - switches::kEnableZeroCopy, ""},
|
| + switches::kEnableOneCopy, ""},
|
| { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED,
|
| - switches::kDisableZeroCopy, ""}
|
| + switches::kDisableOneCopy, ""}
|
| };
|
|
|
| #if defined(OS_ANDROID)
|
| @@ -1550,14 +1550,14 @@ const Experiment kExperiments[] = {
|
| IDS_FLAGS_ONE_COPY_NAME,
|
| IDS_FLAGS_ONE_COPY_DESCRIPTION,
|
| kOsAll,
|
| - SINGLE_VALUE_TYPE(switches::kEnableOneCopy)
|
| + MULTI_VALUE_TYPE(kOneCopyChoices)
|
| },
|
| {
|
| "enable-zero-copy",
|
| IDS_FLAGS_ZERO_COPY_NAME,
|
| IDS_FLAGS_ZERO_COPY_DESCRIPTION,
|
| kOsAll,
|
| - MULTI_VALUE_TYPE(kZeroCopyChoices)
|
| + SINGLE_VALUE_TYPE(switches::kEnableZeroCopy)
|
| },
|
| #if defined(OS_CHROMEOS)
|
| {
|
|
|