Commit 5bc690a0 authored by Wez's avatar Wez

Add Fuchsia to the available Study::Platform enum values.

BUG=750917

Change-Id: Ia6a2f446a6ae8ec0228c12f587756561df0e6051
Reviewed-on: https://chromium-review.googlesource.com/597376
Commit-Queue: Wez <wez@chromium.org>
Reviewed-by: default avatarJesse Doherty <jwd@chromium.org>
Cr-Commit-Position: refs/heads/master@{#491525}
parent 50f71332
...@@ -20,6 +20,8 @@ Study::Platform ClientFilterableState::GetCurrentPlatform() { ...@@ -20,6 +20,8 @@ Study::Platform ClientFilterableState::GetCurrentPlatform() {
return Study::PLATFORM_CHROMEOS; return Study::PLATFORM_CHROMEOS;
#elif defined(OS_ANDROID) #elif defined(OS_ANDROID)
return Study::PLATFORM_ANDROID; return Study::PLATFORM_ANDROID;
#elif defined(OS_FUCHSIA)
return Study::PLATFORM_FUCHSIA;
#elif defined(OS_LINUX) || defined(OS_BSD) || defined(OS_SOLARIS) #elif defined(OS_LINUX) || defined(OS_BSD) || defined(OS_SOLARIS)
// Default BSD and SOLARIS to Linux to not break those builds, although these // Default BSD and SOLARIS to Linux to not break those builds, although these
// platforms are not officially supported by Chrome. // platforms are not officially supported by Chrome.
......
...@@ -189,6 +189,7 @@ message Study { ...@@ -189,6 +189,7 @@ message Study {
PLATFORM_ANDROID = 4; PLATFORM_ANDROID = 4;
PLATFORM_IOS = 5; PLATFORM_IOS = 5;
PLATFORM_ANDROID_WEBVIEW = 6; PLATFORM_ANDROID_WEBVIEW = 6;
PLATFORM_FUCHSIA = 7;
} }
// Possible form factors Chrome is running on. // Possible form factors Chrome is running on.
......
...@@ -215,8 +215,7 @@ TEST(VariationsStudyFilteringTest, CheckStudyPlatform) { ...@@ -215,8 +215,7 @@ TEST(VariationsStudyFilteringTest, CheckStudyPlatform) {
Study::PLATFORM_WINDOWS, Study::PLATFORM_MAC, Study::PLATFORM_WINDOWS, Study::PLATFORM_MAC,
Study::PLATFORM_LINUX, Study::PLATFORM_CHROMEOS, Study::PLATFORM_LINUX, Study::PLATFORM_CHROMEOS,
Study::PLATFORM_ANDROID, Study::PLATFORM_IOS, Study::PLATFORM_ANDROID, Study::PLATFORM_IOS,
Study::PLATFORM_ANDROID_WEBVIEW, Study::PLATFORM_ANDROID_WEBVIEW, Study::PLATFORM_FUCHSIA};
};
ASSERT_EQ(Study::Platform_ARRAYSIZE, static_cast<int>(arraysize(platforms))); ASSERT_EQ(Study::Platform_ARRAYSIZE, static_cast<int>(arraysize(platforms)));
bool platform_added[arraysize(platforms)] = { 0 }; bool platform_added[arraysize(platforms)] = { 0 };
......
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