Commit dea4d905 authored by Gabriel Charette's avatar Gabriel Charette Committed by Commit Bot

[TaskEnvironment] Add plural to ValidTraits

Found while writing docs that this was grammatically incorrect and
inconsistent with other "ValidTraits" around.

TBR=fdoray@chromium.org
(for side-effects outside //base)

Bug: 1002654
Change-Id: Ia8974f79d91021cc258775cdf57b18fe2edc9800
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1795990
Commit-Queue: Gabriel Charette <gab@chromium.org>
Auto-Submit: Gabriel Charette <gab@chromium.org>
Reviewed-by: default avatarFrançois Doray <fdoray@chromium.org>
Cr-Commit-Position: refs/heads/master@{#695619}
parent cefb7a45
...@@ -152,19 +152,19 @@ class TaskEnvironment { ...@@ -152,19 +152,19 @@ class TaskEnvironment {
}; };
// List of traits that are valid inputs for the constructor below. // List of traits that are valid inputs for the constructor below.
struct ValidTrait { struct ValidTraits {
ValidTrait(TimeSource); ValidTraits(TimeSource);
ValidTrait(MainThreadType); ValidTraits(MainThreadType);
ValidTrait(ThreadPoolExecutionMode); ValidTraits(ThreadPoolExecutionMode);
ValidTrait(SubclassCreatesDefaultTaskRunner); ValidTraits(SubclassCreatesDefaultTaskRunner);
ValidTrait(ThreadingMode); ValidTraits(ThreadingMode);
}; };
// Constructor accepts zero or more traits which customize the testing // Constructor accepts zero or more traits which customize the testing
// environment. // environment.
template <typename... TaskEnvironmentTraits, template <typename... TaskEnvironmentTraits,
class CheckArgumentsAreValid = std::enable_if_t< class CheckArgumentsAreValid = std::enable_if_t<
trait_helpers::AreValidTraits<ValidTrait, trait_helpers::AreValidTraits<ValidTraits,
TaskEnvironmentTraits...>::value>> TaskEnvironmentTraits...>::value>>
NOINLINE explicit TaskEnvironment(TaskEnvironmentTraits... traits) NOINLINE explicit TaskEnvironment(TaskEnvironmentTraits... traits)
: TaskEnvironment( : TaskEnvironment(
......
...@@ -81,7 +81,7 @@ class BrowserWithTestWindowTest : public testing::Test { ...@@ -81,7 +81,7 @@ class BrowserWithTestWindowTest : public testing::Test {
// TODO(alexclarke): Make content::BrowserTaskEnvironment::ValidTraits // TODO(alexclarke): Make content::BrowserTaskEnvironment::ValidTraits
// imply this. // imply this.
explicit ValidTraits(base::test::TaskEnvironment::ValidTrait); explicit ValidTraits(base::test::TaskEnvironment::ValidTraits);
}; };
// Creates a BrowserWithTestWindowTest with zero or more traits. By default // Creates a BrowserWithTestWindowTest with zero or more traits. By default
......
...@@ -142,7 +142,7 @@ class BrowserTaskEnvironment : public base::test::TaskEnvironment { ...@@ -142,7 +142,7 @@ class BrowserTaskEnvironment : public base::test::TaskEnvironment {
static constexpr MainThreadType IO_MAINLOOP = MainThreadType::IO; static constexpr MainThreadType IO_MAINLOOP = MainThreadType::IO;
struct ValidTraits { struct ValidTraits {
ValidTraits(TaskEnvironment::ValidTrait); ValidTraits(TaskEnvironment::ValidTraits);
ValidTraits(Options); ValidTraits(Options);
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment