Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1343)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/about_flags_unittest.cc

Issue 1411453004: Componentize internal class FlagsState in flags_ui component. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@feature_entry
Patch Set: Fix compilation on Win32 Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« chrome/browser/about_flags.cc ('K') | « chrome/browser/about_flags.cc ('k') | chrome/browser/chrome_browser_main.cc » ('j') | chrome/browser/chromeos/settings/owner_flags_storage.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/about_flags_unittest.cc
diff --git a/chrome/browser/about_flags_unittest.cc b/chrome/browser/about_flags_unittest.cc
index 0fbe0d9b8388128ce8de12fc21dcb42eb6f9e489..33fd3d6dd149dd002b48bdbe0c81cf54560cd782 100644
--- a/chrome/browser/about_flags_unittest.cc
+++ b/chrome/browser/about_flags_unittest.cc
@@ -4,55 +4,24 @@
#include "chrome/browser/about_flags.h"
-#include <stdint.h>
-#include <utility>
+#include <map>
+#include <set>
+#include <string>
#include "base/feature_list.h"
#include "base/files/file_path.h"
#include "base/format_macros.h"
#include "base/path_service.h"
-#include "base/prefs/pref_registry_simple.h"
-#include "base/prefs/testing_pref_service.h"
#include "base/strings/string_number_conversions.h"
-#include "base/strings/string_split.h"
#include "base/strings/stringprintf.h"
-#include "base/strings/utf_string_conversions.h"
-#include "base/values.h"
-#include "chrome/common/chrome_switches.h"
-#include "chrome/grit/chromium_strings.h"
-#include "components/flags_ui/flags_ui_pref_names.h"
-#include "components/flags_ui/pref_service_flags_storage.h"
-#include "content/public/common/content_switches.h"
+#include "components/flags_ui/feature_entry.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/libxml/chromium/libxml_utils.h"
-using flags_ui::FeatureEntry;
-
namespace about_flags {
namespace {
-const char kFlags1[] = "flag1";
-const char kFlags2[] = "flag2";
-const char kFlags3[] = "flag3";
-const char kFlags4[] = "flag4";
-const char kFlags5[] = "flag5";
-const char kFlags6[] = "flag6";
-const char kFlags7[] = "flag7";
-
-const char kSwitch1[] = "switch";
-const char kSwitch2[] = "switch2";
-const char kSwitch3[] = "switch3";
-const char kSwitch6[] = "switch6";
-const char kValueForSwitch2[] = "value_for_switch2";
-
-const char kMultiSwitch1[] = "multi_switch1";
-const char kMultiSwitch2[] = "multi_switch2";
-const char kValueForMultiSwitch2[] = "value_for_multi_switch2";
-
-const char kEnableDisableValue1[] = "value1";
-const char kEnableDisableValue2[] = "value2";
-
typedef base::HistogramBase::Sample Sample;
typedef std::map<std::string, Sample> SwitchToIdMap;
@@ -199,26 +168,26 @@ std::set<std::string> GetAllSwitchesForTesting() {
std::set<std::string> result;
size_t num_entries = 0;
- const FeatureEntry* entries =
+ const flags_ui::FeatureEntry* entries =
testing::GetFeatureEntries(&num_entries);
for (size_t i = 0; i < num_entries; ++i) {
- const FeatureEntry& entry = entries[i];
+ const flags_ui::FeatureEntry& entry = entries[i];
switch (entry.type) {
- case FeatureEntry::SINGLE_VALUE:
- case FeatureEntry::SINGLE_DISABLE_VALUE:
+ case flags_ui::FeatureEntry::SINGLE_VALUE:
+ case flags_ui::FeatureEntry::SINGLE_DISABLE_VALUE:
result.insert(entry.command_line_switch);
break;
- case FeatureEntry::MULTI_VALUE:
+ case flags_ui::FeatureEntry::MULTI_VALUE:
for (int j = 0; j < entry.num_choices; ++j) {
result.insert(entry.choices[j].command_line_switch);
}
break;
- case FeatureEntry::ENABLE_DISABLE_VALUE:
+ case flags_ui::FeatureEntry::ENABLE_DISABLE_VALUE:
result.insert(entry.command_line_switch);
result.insert(entry.disable_command_line_switch);
break;
- case FeatureEntry::FEATURE_VALUE:
+ case flags_ui::FeatureEntry::FEATURE_VALUE:
break;
}
}
@@ -227,593 +196,10 @@ std::set<std::string> GetAllSwitchesForTesting() {
} // anonymous namespace
-const FeatureEntry::Choice kMultiChoices[] = {
- { IDS_PRODUCT_NAME, "", "" },
- { IDS_PRODUCT_NAME, kMultiSwitch1, "" },
- { IDS_PRODUCT_NAME, kMultiSwitch2, kValueForMultiSwitch2 },
-};
-
-const base::Feature kTestFeature{"FeatureName",
- base::FEATURE_ENABLED_BY_DEFAULT};
-
-// The entries that are set for these tests. The 3rd entry is not supported on
-// the current platform, all others are.
-static FeatureEntry kEntries[] = {
- {kFlags1, IDS_PRODUCT_NAME, IDS_PRODUCT_NAME,
- 0, // Ends up being mapped to the current platform.
- FeatureEntry::SINGLE_VALUE, kSwitch1, "", nullptr, nullptr, nullptr,
- nullptr, 0},
- {kFlags2, IDS_PRODUCT_NAME, IDS_PRODUCT_NAME,
- 0, // Ends up being mapped to the current platform.
- FeatureEntry::SINGLE_VALUE, kSwitch2, kValueForSwitch2, nullptr, nullptr,
- nullptr, nullptr, 0},
- {kFlags3, IDS_PRODUCT_NAME, IDS_PRODUCT_NAME,
- 0, // This ends up enabling for an OS other than the current.
- FeatureEntry::SINGLE_VALUE, kSwitch3, "", nullptr, nullptr, nullptr,
- nullptr, 0},
- {kFlags4, IDS_PRODUCT_NAME, IDS_PRODUCT_NAME,
- 0, // Ends up being mapped to the current platform.
- FeatureEntry::MULTI_VALUE, "", "", "", "", nullptr, kMultiChoices,
- arraysize(kMultiChoices)},
- {kFlags5, IDS_PRODUCT_NAME, IDS_PRODUCT_NAME,
- 0, // Ends up being mapped to the current platform.
- FeatureEntry::ENABLE_DISABLE_VALUE, kSwitch1, kEnableDisableValue1,
- kSwitch2, kEnableDisableValue2, nullptr, nullptr, 3},
- {kFlags6, IDS_PRODUCT_NAME, IDS_PRODUCT_NAME, 0,
- FeatureEntry::SINGLE_DISABLE_VALUE, kSwitch6, "", nullptr, nullptr,
- nullptr, nullptr, 0},
- {kFlags7, IDS_PRODUCT_NAME, IDS_PRODUCT_NAME,
- 0, // Ends up being mapped to the current platform.
- FeatureEntry::FEATURE_VALUE, nullptr, nullptr, nullptr, nullptr,
- &kTestFeature, nullptr, 3},
-};
-
-class AboutFlagsTest : public ::testing::Test {
- protected:
- AboutFlagsTest() : flags_storage_(&prefs_) {
- prefs_.registry()->RegisterListPref(
- flags_ui::prefs::kEnabledLabsExperiments);
- testing::ClearState();
- }
-
- void SetUp() override {
- for (size_t i = 0; i < arraysize(kEntries); ++i)
- kEntries[i].supported_platforms = GetCurrentPlatform();
-
- int os_other_than_current = 1;
- while (os_other_than_current == GetCurrentPlatform())
- os_other_than_current <<= 1;
- kEntries[2].supported_platforms = os_other_than_current;
-
- testing::SetFeatureEntries(kEntries, arraysize(kEntries));
- }
-
- void TearDown() override { testing::SetFeatureEntries(nullptr, 0); }
-
- TestingPrefServiceSimple prefs_;
- flags_ui::PrefServiceFlagsStorage flags_storage_;
-};
-
-
-TEST_F(AboutFlagsTest, NoChangeNoRestart) {
- EXPECT_FALSE(IsRestartNeededToCommitChanges());
- SetFeatureEntryEnabled(&flags_storage_, kFlags1, false);
- EXPECT_FALSE(IsRestartNeededToCommitChanges());
-
- // kFlags6 is enabled by default, so enabling should not require a restart.
- SetFeatureEntryEnabled(&flags_storage_, kFlags6, true);
- EXPECT_FALSE(IsRestartNeededToCommitChanges());
-}
-
-TEST_F(AboutFlagsTest, ChangeNeedsRestart) {
- EXPECT_FALSE(IsRestartNeededToCommitChanges());
- SetFeatureEntryEnabled(&flags_storage_, kFlags1, true);
- EXPECT_TRUE(IsRestartNeededToCommitChanges());
-}
-
-// Tests that disabling a default enabled entry requires a restart.
-TEST_F(AboutFlagsTest, DisableChangeNeedsRestart) {
- EXPECT_FALSE(IsRestartNeededToCommitChanges());
- SetFeatureEntryEnabled(&flags_storage_, kFlags6, false);
- EXPECT_TRUE(IsRestartNeededToCommitChanges());
-}
-
-TEST_F(AboutFlagsTest, MultiFlagChangeNeedsRestart) {
- const FeatureEntry& entry = kEntries[3];
- ASSERT_EQ(kFlags4, entry.internal_name);
- EXPECT_FALSE(IsRestartNeededToCommitChanges());
- // Enable the 2nd choice of the multi-value.
- SetFeatureEntryEnabled(&flags_storage_, entry.NameForChoice(2), true);
- EXPECT_TRUE(IsRestartNeededToCommitChanges());
- testing::ClearState();
- EXPECT_FALSE(IsRestartNeededToCommitChanges());
- // Enable the default choice now.
- SetFeatureEntryEnabled(&flags_storage_, entry.NameForChoice(0), true);
- EXPECT_TRUE(IsRestartNeededToCommitChanges());
-}
-
-TEST_F(AboutFlagsTest, AddTwoFlagsRemoveOne) {
- // Add two entries, check they're there.
- SetFeatureEntryEnabled(&flags_storage_, kFlags1, true);
- SetFeatureEntryEnabled(&flags_storage_, kFlags2, true);
-
- const base::ListValue* entries_list =
- prefs_.GetList(flags_ui::prefs::kEnabledLabsExperiments);
- ASSERT_TRUE(entries_list != nullptr);
-
- ASSERT_EQ(2u, entries_list->GetSize());
-
- std::string s0;
- ASSERT_TRUE(entries_list->GetString(0, &s0));
- std::string s1;
- ASSERT_TRUE(entries_list->GetString(1, &s1));
-
- EXPECT_TRUE(s0 == kFlags1 || s1 == kFlags1);
- EXPECT_TRUE(s0 == kFlags2 || s1 == kFlags2);
-
- // Remove one entry, check the other's still around.
- SetFeatureEntryEnabled(&flags_storage_, kFlags2, false);
-
- entries_list = prefs_.GetList(flags_ui::prefs::kEnabledLabsExperiments);
- ASSERT_TRUE(entries_list != nullptr);
- ASSERT_EQ(1u, entries_list->GetSize());
- ASSERT_TRUE(entries_list->GetString(0, &s0));
- EXPECT_TRUE(s0 == kFlags1);
-}
-
-TEST_F(AboutFlagsTest, AddTwoFlagsRemoveBoth) {
- // Add two entries, check the pref exists.
- SetFeatureEntryEnabled(&flags_storage_, kFlags1, true);
- SetFeatureEntryEnabled(&flags_storage_, kFlags2, true);
- const base::ListValue* entries_list =
- prefs_.GetList(flags_ui::prefs::kEnabledLabsExperiments);
- ASSERT_TRUE(entries_list != nullptr);
-
- // Remove both, the pref should have been removed completely.
- SetFeatureEntryEnabled(&flags_storage_, kFlags1, false);
- SetFeatureEntryEnabled(&flags_storage_, kFlags2, false);
- entries_list = prefs_.GetList(flags_ui::prefs::kEnabledLabsExperiments);
- EXPECT_TRUE(entries_list == nullptr || entries_list->GetSize() == 0);
-}
-
-TEST_F(AboutFlagsTest, ConvertFlagsToSwitches) {
- SetFeatureEntryEnabled(&flags_storage_, kFlags1, true);
-
- base::CommandLine command_line(base::CommandLine::NO_PROGRAM);
- command_line.AppendSwitch("foo");
-
- EXPECT_TRUE(command_line.HasSwitch("foo"));
- EXPECT_FALSE(command_line.HasSwitch(kSwitch1));
-
- ConvertFlagsToSwitches(&flags_storage_, &command_line, kAddSentinels);
-
- EXPECT_TRUE(command_line.HasSwitch("foo"));
- EXPECT_TRUE(command_line.HasSwitch(kSwitch1));
- EXPECT_TRUE(command_line.HasSwitch(switches::kFlagSwitchesBegin));
- EXPECT_TRUE(command_line.HasSwitch(switches::kFlagSwitchesEnd));
-
- base::CommandLine command_line2(base::CommandLine::NO_PROGRAM);
-
- ConvertFlagsToSwitches(&flags_storage_, &command_line2, kNoSentinels);
-
- EXPECT_TRUE(command_line2.HasSwitch(kSwitch1));
- EXPECT_FALSE(command_line2.HasSwitch(switches::kFlagSwitchesBegin));
- EXPECT_FALSE(command_line2.HasSwitch(switches::kFlagSwitchesEnd));
-}
-
-base::CommandLine::StringType CreateSwitch(const std::string& value) {
-#if defined(OS_WIN)
- return base::ASCIIToUTF16(value);
-#else
- return value;
-#endif
-}
-
-TEST_F(AboutFlagsTest, CompareSwitchesToCurrentCommandLine) {
- SetFeatureEntryEnabled(&flags_storage_, kFlags1, true);
-
- const std::string kDoubleDash("--");
-
- base::CommandLine command_line(base::CommandLine::NO_PROGRAM);
- command_line.AppendSwitch("foo");
-
- base::CommandLine new_command_line(base::CommandLine::NO_PROGRAM);
- ConvertFlagsToSwitches(&flags_storage_, &new_command_line, kAddSentinels);
-
- EXPECT_FALSE(AreSwitchesIdenticalToCurrentCommandLine(new_command_line,
- command_line, nullptr));
- {
- std::set<base::CommandLine::StringType> difference;
- EXPECT_FALSE(AreSwitchesIdenticalToCurrentCommandLine(
- new_command_line, command_line, &difference));
- EXPECT_EQ(1U, difference.size());
- EXPECT_EQ(1U, difference.count(CreateSwitch(kDoubleDash + kSwitch1)));
- }
-
- ConvertFlagsToSwitches(&flags_storage_, &command_line, kAddSentinels);
-
- EXPECT_TRUE(AreSwitchesIdenticalToCurrentCommandLine(new_command_line,
- command_line, nullptr));
- {
- std::set<base::CommandLine::StringType> difference;
- EXPECT_TRUE(AreSwitchesIdenticalToCurrentCommandLine(
- new_command_line, command_line, &difference));
- EXPECT_TRUE(difference.empty());
- }
-
- // Now both have flags but different.
- SetFeatureEntryEnabled(&flags_storage_, kFlags1, false);
- SetFeatureEntryEnabled(&flags_storage_, kFlags2, true);
-
- base::CommandLine another_command_line(base::CommandLine::NO_PROGRAM);
- ConvertFlagsToSwitches(&flags_storage_, &another_command_line, kAddSentinels);
-
- EXPECT_FALSE(AreSwitchesIdenticalToCurrentCommandLine(
- new_command_line, another_command_line, nullptr));
- {
- std::set<base::CommandLine::StringType> difference;
- EXPECT_FALSE(AreSwitchesIdenticalToCurrentCommandLine(
- new_command_line, another_command_line, &difference));
- EXPECT_EQ(2U, difference.size());
- EXPECT_EQ(1U, difference.count(CreateSwitch(kDoubleDash + kSwitch1)));
- EXPECT_EQ(1U,
- difference.count(CreateSwitch(kDoubleDash + kSwitch2 + "=" +
- kValueForSwitch2)));
- }
-}
-
-TEST_F(AboutFlagsTest, RemoveFlagSwitches) {
- std::map<std::string, base::CommandLine::StringType> switch_list;
- switch_list[kSwitch1] = base::CommandLine::StringType();
- switch_list[switches::kFlagSwitchesBegin] = base::CommandLine::StringType();
- switch_list[switches::kFlagSwitchesEnd] = base::CommandLine::StringType();
- switch_list["foo"] = base::CommandLine::StringType();
-
- SetFeatureEntryEnabled(&flags_storage_, kFlags1, true);
-
- // This shouldn't do anything before ConvertFlagsToSwitches() wasn't called.
- RemoveFlagsSwitches(&switch_list);
- ASSERT_EQ(4u, switch_list.size());
- EXPECT_TRUE(ContainsKey(switch_list, kSwitch1));
- EXPECT_TRUE(ContainsKey(switch_list, switches::kFlagSwitchesBegin));
- EXPECT_TRUE(ContainsKey(switch_list, switches::kFlagSwitchesEnd));
- EXPECT_TRUE(ContainsKey(switch_list, "foo"));
-
- // Call ConvertFlagsToSwitches(), then RemoveFlagsSwitches() again.
- base::CommandLine command_line(base::CommandLine::NO_PROGRAM);
- command_line.AppendSwitch("foo");
- ConvertFlagsToSwitches(&flags_storage_, &command_line, kAddSentinels);
- RemoveFlagsSwitches(&switch_list);
-
- // Now the about:flags-related switch should have been removed.
- ASSERT_EQ(1u, switch_list.size());
- EXPECT_TRUE(ContainsKey(switch_list, "foo"));
-}
-
-TEST_F(AboutFlagsTest, RemoveFlagSwitches_Features) {
- struct {
- int enabled_choice; // 0: default, 1: enabled, 2: disabled.
- const char* existing_enable_features;
- const char* existing_disable_features;
- const char* expected_enable_features;
- const char* expected_disable_features;
- } cases[] = {
- // Default value: Should not affect existing flags.
- {0, nullptr, nullptr, nullptr, nullptr},
- {0, "A,B", "C", "A,B", "C"},
- // "Enable" option: should only affect enabled list.
- {1, nullptr, nullptr, "FeatureName", nullptr},
- {1, "A,B", "C", "A,B,FeatureName", "C"},
- // "Disable" option: should only affect disabled list.
- {2, nullptr, nullptr, nullptr, "FeatureName"},
- {2, "A,B", "C", "A,B", "C,FeatureName"},
- };
-
- for (size_t i = 0; i < arraysize(cases); ++i) {
- SCOPED_TRACE(base::StringPrintf(
- "Test[%" PRIuS "]: %d [%s] [%s]", i, cases[i].enabled_choice,
- cases[i].existing_enable_features ? cases[i].existing_enable_features
- : "null",
- cases[i].existing_disable_features ? cases[i].existing_disable_features
- : "null"));
-
- base::CommandLine command_line(base::CommandLine::NO_PROGRAM);
- if (cases[i].existing_enable_features) {
- command_line.AppendSwitchASCII(switches::kEnableFeatures,
- cases[i].existing_enable_features);
- }
- if (cases[i].existing_disable_features) {
- command_line.AppendSwitchASCII(switches::kDisableFeatures,
- cases[i].existing_disable_features);
- }
-
- testing::ClearState();
-
- const std::string entry_name = base::StringPrintf(
- "%s%s%d", kFlags7, flags_ui::testing::kMultiSeparator,
- cases[i].enabled_choice);
- SetFeatureEntryEnabled(&flags_storage_, entry_name, true);
-
- ConvertFlagsToSwitches(&flags_storage_, &command_line, kAddSentinels);
- auto switch_list = command_line.GetSwitches();
- EXPECT_EQ(cases[i].expected_enable_features != nullptr,
- ContainsKey(switch_list, switches::kEnableFeatures));
- if (cases[i].expected_enable_features)
- EXPECT_EQ(CreateSwitch(cases[i].expected_enable_features),
- switch_list[switches::kEnableFeatures]);
-
- EXPECT_EQ(cases[i].expected_disable_features != nullptr,
- ContainsKey(switch_list, switches::kDisableFeatures));
- if (cases[i].expected_disable_features)
- EXPECT_EQ(CreateSwitch(cases[i].expected_disable_features),
- switch_list[switches::kDisableFeatures]);
-
- // RemoveFlagsSwitches() should result in the original values for these
- // switches.
- switch_list = command_line.GetSwitches();
- RemoveFlagsSwitches(&switch_list);
- EXPECT_EQ(cases[i].existing_enable_features != nullptr,
- ContainsKey(switch_list, switches::kEnableFeatures));
- if (cases[i].existing_enable_features)
- EXPECT_EQ(CreateSwitch(cases[i].existing_enable_features),
- switch_list[switches::kEnableFeatures]);
- EXPECT_EQ(cases[i].existing_disable_features != nullptr,
- ContainsKey(switch_list, switches::kEnableFeatures));
- if (cases[i].existing_disable_features)
- EXPECT_EQ(CreateSwitch(cases[i].existing_disable_features),
- switch_list[switches::kDisableFeatures]);
- }
-}
-
-// Tests enabling entries that aren't supported on the current platform.
-TEST_F(AboutFlagsTest, PersistAndPrune) {
- // Enable entries 1 and 3.
- SetFeatureEntryEnabled(&flags_storage_, kFlags1, true);
- SetFeatureEntryEnabled(&flags_storage_, kFlags3, true);
- base::CommandLine command_line(base::CommandLine::NO_PROGRAM);
- EXPECT_FALSE(command_line.HasSwitch(kSwitch1));
- EXPECT_FALSE(command_line.HasSwitch(kSwitch3));
-
- // Convert the flags to switches. Entry 3 shouldn't be among the switches
- // as it is not applicable to the current platform.
- ConvertFlagsToSwitches(&flags_storage_, &command_line, kAddSentinels);
- EXPECT_TRUE(command_line.HasSwitch(kSwitch1));
- EXPECT_FALSE(command_line.HasSwitch(kSwitch3));
-
- // FeatureEntry 3 should show still be persisted in preferences though.
- const base::ListValue* entries_list =
- prefs_.GetList(flags_ui::prefs::kEnabledLabsExperiments);
- ASSERT_TRUE(entries_list);
- EXPECT_EQ(2U, entries_list->GetSize());
- std::string s0;
- ASSERT_TRUE(entries_list->GetString(0, &s0));
- EXPECT_EQ(kFlags1, s0);
- std::string s1;
- ASSERT_TRUE(entries_list->GetString(1, &s1));
- EXPECT_EQ(kFlags3, s1);
-}
-
-// Tests that switches which should have values get them in the command
-// line.
-TEST_F(AboutFlagsTest, CheckValues) {
- // Enable entries 1 and 2.
- SetFeatureEntryEnabled(&flags_storage_, kFlags1, true);
- SetFeatureEntryEnabled(&flags_storage_, kFlags2, true);
- base::CommandLine command_line(base::CommandLine::NO_PROGRAM);
- EXPECT_FALSE(command_line.HasSwitch(kSwitch1));
- EXPECT_FALSE(command_line.HasSwitch(kSwitch2));
-
- // Convert the flags to switches.
- ConvertFlagsToSwitches(&flags_storage_, &command_line, kAddSentinels);
- EXPECT_TRUE(command_line.HasSwitch(kSwitch1));
- EXPECT_EQ(std::string(), command_line.GetSwitchValueASCII(kSwitch1));
- EXPECT_TRUE(command_line.HasSwitch(kSwitch2));
- EXPECT_EQ(std::string(kValueForSwitch2),
- command_line.GetSwitchValueASCII(kSwitch2));
-
- // Confirm that there is no '=' in the command line for simple switches.
- std::string switch1_with_equals = std::string("--") +
- std::string(kSwitch1) +
- std::string("=");
-#if defined(OS_WIN)
- EXPECT_EQ(base::string16::npos,
- command_line.GetCommandLineString().find(
- base::ASCIIToUTF16(switch1_with_equals)));
-#else
- EXPECT_EQ(std::string::npos,
- command_line.GetCommandLineString().find(switch1_with_equals));
-#endif
-
- // And confirm there is a '=' for switches with values.
- std::string switch2_with_equals = std::string("--") +
- std::string(kSwitch2) +
- std::string("=");
-#if defined(OS_WIN)
- EXPECT_NE(base::string16::npos,
- command_line.GetCommandLineString().find(
- base::ASCIIToUTF16(switch2_with_equals)));
-#else
- EXPECT_NE(std::string::npos,
- command_line.GetCommandLineString().find(switch2_with_equals));
-#endif
-
- // And it should persist.
- const base::ListValue* entries_list =
- prefs_.GetList(flags_ui::prefs::kEnabledLabsExperiments);
- ASSERT_TRUE(entries_list);
- EXPECT_EQ(2U, entries_list->GetSize());
- std::string s0;
- ASSERT_TRUE(entries_list->GetString(0, &s0));
- EXPECT_EQ(kFlags1, s0);
- std::string s1;
- ASSERT_TRUE(entries_list->GetString(1, &s1));
- EXPECT_EQ(kFlags2, s1);
-}
-
-// Tests multi-value type entries.
-TEST_F(AboutFlagsTest, MultiValues) {
- const FeatureEntry& entry = kEntries[3];
- ASSERT_EQ(kFlags4, entry.internal_name);
-
- // Initially, the first "deactivated" option of the multi entry should
- // be set.
- {
- base::CommandLine command_line(base::CommandLine::NO_PROGRAM);
- ConvertFlagsToSwitches(&flags_storage_, &command_line, kAddSentinels);
- EXPECT_FALSE(command_line.HasSwitch(kMultiSwitch1));
- EXPECT_FALSE(command_line.HasSwitch(kMultiSwitch2));
- }
-
- // Enable the 2nd choice of the multi-value.
- SetFeatureEntryEnabled(&flags_storage_, entry.NameForChoice(2), true);
- {
- base::CommandLine command_line(base::CommandLine::NO_PROGRAM);
- ConvertFlagsToSwitches(&flags_storage_, &command_line, kAddSentinels);
- EXPECT_FALSE(command_line.HasSwitch(kMultiSwitch1));
- EXPECT_TRUE(command_line.HasSwitch(kMultiSwitch2));
- EXPECT_EQ(std::string(kValueForMultiSwitch2),
- command_line.GetSwitchValueASCII(kMultiSwitch2));
- }
-
- // Disable the multi-value entry.
- SetFeatureEntryEnabled(&flags_storage_, entry.NameForChoice(0), true);
- {
- base::CommandLine command_line(base::CommandLine::NO_PROGRAM);
- ConvertFlagsToSwitches(&flags_storage_, &command_line, kAddSentinels);
- EXPECT_FALSE(command_line.HasSwitch(kMultiSwitch1));
- EXPECT_FALSE(command_line.HasSwitch(kMultiSwitch2));
- }
-}
-
-// Tests that disable flags are added when an entry is disabled.
-TEST_F(AboutFlagsTest, DisableFlagCommandLine) {
- // Nothing selected.
- {
- base::CommandLine command_line(base::CommandLine::NO_PROGRAM);
- ConvertFlagsToSwitches(&flags_storage_, &command_line, kAddSentinels);
- EXPECT_FALSE(command_line.HasSwitch(kSwitch6));
- }
-
- // Disable the entry 6.
- SetFeatureEntryEnabled(&flags_storage_, kFlags6, false);
- {
- base::CommandLine command_line(base::CommandLine::NO_PROGRAM);
- ConvertFlagsToSwitches(&flags_storage_, &command_line, kAddSentinels);
- EXPECT_TRUE(command_line.HasSwitch(kSwitch6));
- }
-
- // Enable entry 6.
- SetFeatureEntryEnabled(&flags_storage_, kFlags6, true);
- {
- base::CommandLine command_line(base::CommandLine::NO_PROGRAM);
- ConvertFlagsToSwitches(&flags_storage_, &command_line, kAddSentinels);
- EXPECT_FALSE(command_line.HasSwitch(kSwitch6));
- }
-}
-
-TEST_F(AboutFlagsTest, EnableDisableValues) {
- const FeatureEntry& entry = kEntries[4];
- ASSERT_EQ(kFlags5, entry.internal_name);
-
- // Nothing selected.
- {
- base::CommandLine command_line(base::CommandLine::NO_PROGRAM);
- ConvertFlagsToSwitches(&flags_storage_, &command_line, kAddSentinels);
- EXPECT_FALSE(command_line.HasSwitch(kSwitch1));
- EXPECT_FALSE(command_line.HasSwitch(kSwitch2));
- }
-
- // "Enable" option selected.
- SetFeatureEntryEnabled(&flags_storage_, entry.NameForChoice(1), true);
- {
- base::CommandLine command_line(base::CommandLine::NO_PROGRAM);
- ConvertFlagsToSwitches(&flags_storage_, &command_line, kAddSentinels);
- EXPECT_TRUE(command_line.HasSwitch(kSwitch1));
- EXPECT_FALSE(command_line.HasSwitch(kSwitch2));
- EXPECT_EQ(kEnableDisableValue1, command_line.GetSwitchValueASCII(kSwitch1));
- }
-
- // "Disable" option selected.
- SetFeatureEntryEnabled(&flags_storage_, entry.NameForChoice(2), true);
- {
- base::CommandLine command_line(base::CommandLine::NO_PROGRAM);
- ConvertFlagsToSwitches(&flags_storage_, &command_line, kAddSentinels);
- EXPECT_FALSE(command_line.HasSwitch(kSwitch1));
- EXPECT_TRUE(command_line.HasSwitch(kSwitch2));
- EXPECT_EQ(kEnableDisableValue2, command_line.GetSwitchValueASCII(kSwitch2));
- }
-
- // "Default" option selected, same as nothing selected.
- SetFeatureEntryEnabled(&flags_storage_, entry.NameForChoice(0), true);
- {
- base::CommandLine command_line(base::CommandLine::NO_PROGRAM);
- ConvertFlagsToSwitches(&flags_storage_, &command_line, kAddSentinels);
- EXPECT_FALSE(command_line.HasSwitch(kMultiSwitch1));
- EXPECT_FALSE(command_line.HasSwitch(kMultiSwitch2));
- }
-}
-
-TEST_F(AboutFlagsTest, FeatureValues) {
- const FeatureEntry& entry = kEntries[6];
- ASSERT_EQ(kFlags7, entry.internal_name);
-
- struct {
- int enabled_choice;
- const char* existing_enable_features;
- const char* existing_disable_features;
- const char* expected_enable_features;
- const char* expected_disable_features;
- } cases[] = {
- // Nothing selected.
- {-1, nullptr, nullptr, "", ""},
- // "Default" option selected, same as nothing selected.
- {0, nullptr, nullptr, "", ""},
- // "Enable" option selected.
- {1, nullptr, nullptr, "FeatureName", ""},
- // "Disable" option selected.
- {2, nullptr, nullptr, "", "FeatureName"},
- // "Enable" option should get added to the existing list.
- {1, "Foo,Bar", nullptr, "Foo,Bar,FeatureName", ""},
- // "Disable" option should get added to the existing list.
- {2, nullptr, "Foo,Bar", "", "Foo,Bar,FeatureName"},
- };
-
- for (size_t i = 0; i < arraysize(cases); ++i) {
- SCOPED_TRACE(base::StringPrintf(
- "Test[%" PRIuS "]: %d [%s] [%s]", i, cases[i].enabled_choice,
- cases[i].existing_enable_features ? cases[i].existing_enable_features
- : "null",
- cases[i].existing_disable_features ? cases[i].existing_disable_features
- : "null"));
-
- if (cases[i].enabled_choice != -1) {
- SetFeatureEntryEnabled(
- &flags_storage_, entry.NameForChoice(cases[i].enabled_choice), true);
- }
-
- base::CommandLine command_line(base::CommandLine::NO_PROGRAM);
- if (cases[i].existing_enable_features) {
- command_line.AppendSwitchASCII(switches::kEnableFeatures,
- cases[i].existing_enable_features);
- }
- if (cases[i].existing_disable_features) {
- command_line.AppendSwitchASCII(switches::kDisableFeatures,
- cases[i].existing_disable_features);
- }
-
- ConvertFlagsToSwitches(&flags_storage_, &command_line, kAddSentinels);
- EXPECT_EQ(cases[i].expected_enable_features,
- command_line.GetSwitchValueASCII(switches::kEnableFeatures));
- EXPECT_EQ(cases[i].expected_disable_features,
- command_line.GetSwitchValueASCII(switches::kDisableFeatures));
- }
-}
-
// Makes sure there are no separators in any of the entry names.
-TEST_F(AboutFlagsTest, NoSeparators) {
- testing::SetFeatureEntries(nullptr, 0);
+TEST(AboutFlagsTest, NoSeparators) {
size_t count;
- const FeatureEntry* entries = testing::GetFeatureEntries(&count);
+ const flags_ui::FeatureEntry* entries = testing::GetFeatureEntries(&count);
for (size_t i = 0; i < count; ++i) {
std::string name = entries[i].internal_name;
EXPECT_EQ(std::string::npos, name.find(flags_ui::testing::kMultiSeparator))
« chrome/browser/about_flags.cc ('K') | « chrome/browser/about_flags.cc ('k') | chrome/browser/chrome_browser_main.cc » ('j') | chrome/browser/chromeos/settings/owner_flags_storage.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698