Make base::Value::TYPE a scoped enum.

components/sync_preferences/pref_model_associator_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 "components/sync_preferences/pref_model_associator.h"
 
 #include <memory>
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
@@ skipping 63 matching lines @@
     expression_dict->SetWithoutPathExpansion(
         "setting", new base::FundamentalValue(setting));
   }
 
   void SetPrefToEmpty(const std::string& pref_name) {
     std::unique_ptr<base::Value> empty_value;
     const PrefService::Preference* pref =
         pref_service_->FindPreference(pref_name.c_str());
     ASSERT_TRUE(pref);
     base::Value::Type type = pref->GetType();
-    if (type == base::Value::TYPE_DICTIONARY)
+    if (type == base::Value::Type::DICTIONARY)
       empty_value.reset(new base::DictionaryValue);
-    else if (type == base::Value::TYPE_LIST)
+    else if (type == base::Value::Type::LIST)
       empty_value.reset(new base::ListValue);
     else
       FAIL();
     pref_service_->Set(pref_name.c_str(), *empty_value);
   }
 
   TestPrefModelAssociatorClient client_;
   std::unique_ptr<PrefServiceSyncable> pref_service_;
   PrefModelAssociator* pref_sync_service_;
 };
@@ skipping 335 matching lines @@
   base::DictionaryValue server_patterns_;
 };
 
 TEST_F(IndividualPreferenceMergeTest, ListPreference) {
   EXPECT_TRUE(MergeListPreference(kListPrefName));
 }
 
 }  // namespace
 
 }  // namespace sync_preferences