Componentize about_flags::FeatureEntry in flags_ui component.

chrome/browser/about_flags_unittest.cc

Index: chrome/browser/about_flags_unittest.cc
diff --git a/chrome/browser/about_flags_unittest.cc b/chrome/browser/about_flags_unittest.cc
index ca5ebb950d7ebb54c79459122c2d902d63033962..0fbe0d9b8388128ce8de12fc21dcb42eb6f9e489 100644
--- a/chrome/browser/about_flags_unittest.cc
+++ b/chrome/browser/about_flags_unittest.cc
@@ -26,6 +26,8 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/libxml/chromium/libxml_utils.h"
 
+using flags_ui::FeatureEntry;
+
 namespace about_flags {
 
 namespace {
@@ -528,7 +530,8 @@ TEST_F(AboutFlagsTest, RemoveFlagSwitches_Features) {
     testing::ClearState();
 
     const std::string entry_name = base::StringPrintf(
-        "%s%s%d", kFlags7, testing::kMultiSeparator, cases[i].enabled_choice);
+        "%s%s%d", kFlags7, flags_ui::testing::kMultiSeparator,
+        cases[i].enabled_choice);
     SetFeatureEntryEnabled(&flags_storage_, entry_name, true);
 
     ConvertFlagsToSwitches(&flags_storage_, &command_line, kAddSentinels);
@@ -813,7 +816,8 @@ TEST_F(AboutFlagsTest, NoSeparators) {
   const 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(testing::kMultiSeparator)) << i;
+    EXPECT_EQ(std::string::npos, name.find(flags_ui::testing::kMultiSeparator))
+        << i;
   }
 }