base: Rename ValueType to something less redundant as _just_ Type.

chrome/browser/prefs/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 "base/memory/scoped_ptr.h"
 #include "base/values.h"
 #include "chrome/browser/prefs/pref_model_associator.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_browser_process_test.h"
@@ skipping 21 matching lines @@
     expression_dict->SetWithoutPathExpansion(
         content_type,
         Value::CreateIntegerValue(setting));
   }
 
   void SetPrefToEmpty(const std::string& pref_name) {
     scoped_ptr<Value> empty_value;
     const PrefService::Preference* pref =
         pref_service_->FindPreference(pref_name.c_str());
     ASSERT_TRUE(pref);
-    Value::ValueType type = pref->GetType();
+    base::Value::Type type = pref->GetType();
     if (type == Value::TYPE_DICTIONARY)
       empty_value.reset(new DictionaryValue);
     else if (type == Value::TYPE_LIST)
       empty_value.reset(new ListValue);
     else
       FAIL();
     pref_service_->Set(pref_name.c_str(), *empty_value);
   }
 
   TestingProfile profile_;
@@ skipping 341 matching lines @@
   EXPECT_TRUE(MergeListPreference(prefs::kDesktopNotificationDeniedOrigins));
 }
 
 TEST_F(IndividualPreferenceMergeTest, ContentSettingsPatterns) {
   EXPECT_TRUE(MergeDictionaryPreference(prefs::kContentSettingsPatterns));
 }
 
 TEST_F(IndividualPreferenceMergeTest, GeolocationContentSettings) {
   EXPECT_TRUE(MergeDictionaryPreference(prefs::kGeolocationContentSettings));
 }