Componentize about_flags::FeatureEntry in flags_ui component.

chrome/browser/about_flags_unittest.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/about_flags.h"
 
 #include <stdint.h>
 #include <utility>
 
 #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 "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";
@@ skipping 479 matching lines @@
                                      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, 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);
     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]);
 
@@ skipping 264 matching lines @@
   }
 }
 
 // Makes sure there are no separators in any of the entry names.
 TEST_F(AboutFlagsTest, NoSeparators) {
   testing::SetFeatureEntries(nullptr, 0);
   size_t count;
   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;
   }
 }
 
 class AboutFlagsHistogramTest : public ::testing::Test {
  protected:
   // This is a helper function to check that all IDs in enum LoginCustomFlags in
   // histograms.xml are unique.
   void SetSwitchToHistogramIdMapping(const std::string& switch_name,
                                      const Sample switch_histogram_id,
                                      std::map<std::string, Sample>* out_map) {
@@ skipping 79 matching lines @@
     EXPECT_TRUE(enum_entry != histograms_xml_switches_ids.end() &&
                 enum_entry->first == flag)
         << "histograms.xml enum LoginCustomFlags doesn't contain switch '"
         << flag << "' (value=" << uma_id
         << " expected). Consider adding entry:\n"
         << "  " << GetHistogramEnumEntryText(flag, uma_id);
   }
 }
 
 }  // namespace about_flags