summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--base/values.cc30
-rw-r--r--base/values.h8
-rw-r--r--base/values_unittest.cc3
-rw-r--r--chrome/browser/chromeos/login/user_manager.cc3
-rw-r--r--chrome/browser/geolocation/geolocation_content_settings_map.cc2
-rw-r--r--chrome/browser/host_zoom_map_unittest.cc11
6 files changed, 6 insertions, 51 deletions
diff --git a/base/values.cc b/base/values.cc
index c4f33c9..1a1695c 100644
--- a/base/values.cc
+++ b/base/values.cc
@@ -747,36 +747,6 @@ bool DictionaryValue::GetListWithoutPathExpansion(const std::string& key,
return true;
}
-// TODO(viettrungluu): Deprecated and to be removed:
-bool DictionaryValue::GetWithoutPathExpansion(const std::wstring& key,
- Value** out_value) const {
- return GetWithoutPathExpansion(WideToUTF8(key), out_value);
-}
-
-// TODO(viettrungluu): Deprecated and to be removed:
-bool DictionaryValue::GetIntegerWithoutPathExpansion(const std::wstring& key,
- int* out_value) const {
- return GetIntegerWithoutPathExpansion(WideToUTF8(key), out_value);
-}
-
-// TODO(viettrungluu): Deprecated and to be removed:
-bool DictionaryValue::GetStringWithoutPathExpansion(
- const std::wstring& key,
- std::string* out_value) const {
- return GetStringWithoutPathExpansion(WideToUTF8(key), out_value);
-}
-
-// TODO(viettrungluu): Deprecated and to be removed:
-bool DictionaryValue::GetStringWithoutPathExpansion(
- const std::wstring& key,
- std::wstring* out_value) const {
- Value* value;
- if (!GetWithoutPathExpansion(WideToUTF8(key), &value))
- return false;
-
- return value->GetAsString(out_value);
-}
-
bool DictionaryValue::Remove(const std::string& path, Value** out_value) {
DCHECK(IsStringUTF8(path));
std::string current_path(path);
diff --git a/base/values.h b/base/values.h
index a750422..54230c9 100644
--- a/base/values.h
+++ b/base/values.h
@@ -323,14 +323,6 @@ class DictionaryValue : public Value {
DictionaryValue** out_value) const;
bool GetListWithoutPathExpansion(const std::string& key,
ListValue** out_value) const;
- /*DEPRECATED*/bool GetWithoutPathExpansion(const std::wstring& key,
- Value** out_value) const;
- /*DEPRECATED*/bool GetIntegerWithoutPathExpansion(const std::wstring& key,
- int* out_value) const;
- /*DEPRECATED*/bool GetStringWithoutPathExpansion(
- const std::wstring& key, std::string* out_value) const;
- /*DEPRECATED*/bool GetStringWithoutPathExpansion(
- const std::wstring& key, std::wstring* out_value) const;
// Removes the Value with the specified path from this dictionary (or one
// of its child dictionaries, if the path is more than just a local key).
diff --git a/base/values_unittest.cc b/base/values_unittest.cc
index 82d6082..81bd675 100644
--- a/base/values_unittest.cc
+++ b/base/values_unittest.cc
@@ -508,9 +508,6 @@ TEST_F(ValuesTest, DictionaryWithoutPathExpansionDeprecated) {
EXPECT_TRUE(dict.HasKey(L"this.isnt.expanded"));
Value* value3;
EXPECT_FALSE(dict.Get(L"this.isnt.expanded", &value3));
- Value* value4;
- ASSERT_TRUE(dict.GetWithoutPathExpansion(L"this.isnt.expanded", &value4));
- EXPECT_EQ(Value::TYPE_NULL, value4->GetType());
}
TEST_F(ValuesTest, DeepCopy) {
diff --git a/chrome/browser/chromeos/login/user_manager.cc b/chrome/browser/chromeos/login/user_manager.cc
index baba41a..ca8cb5a 100644
--- a/chrome/browser/chromeos/login/user_manager.cc
+++ b/chrome/browser/chromeos/login/user_manager.cc
@@ -130,8 +130,7 @@ std::vector<UserManager::User> UserManager::GetUsers() const {
std::string image_path;
if (image_it == user_images_.end()) {
if (prefs_images &&
- prefs_images->GetStringWithoutPathExpansion(
- ASCIIToWide(email), &image_path)) {
+ prefs_images->GetStringWithoutPathExpansion(email, &image_path)) {
// Insert the default image so we don't send another request if
// GetUsers is called twice.
user_images_[email] = user.image();
diff --git a/chrome/browser/geolocation/geolocation_content_settings_map.cc b/chrome/browser/geolocation/geolocation_content_settings_map.cc
index b9e84dc5..d734a24 100644
--- a/chrome/browser/geolocation/geolocation_content_settings_map.cc
+++ b/chrome/browser/geolocation/geolocation_content_settings_map.cc
@@ -70,7 +70,7 @@ ContentSetting GeolocationContentSettingsMap::GetContentSetting(
requesting_origin.spec(), &requesting_origin_settings)) {
int setting;
if (requesting_origin_settings->GetIntegerWithoutPathExpansion(
- UTF8ToWide(embedding_origin.spec()), &setting))
+ embedding_origin.spec(), &setting))
return IntToContentSetting(setting);
// Check for any-embedder setting
if (requesting_origin != embedding_origin &&
diff --git a/chrome/browser/host_zoom_map_unittest.cc b/chrome/browser/host_zoom_map_unittest.cc
index 4b20a09..bd503ba 100644
--- a/chrome/browser/host_zoom_map_unittest.cc
+++ b/chrome/browser/host_zoom_map_unittest.cc
@@ -63,8 +63,7 @@ TEST_F(HostZoomMapTest, LoadNoPrefs) {
TEST_F(HostZoomMapTest, Load) {
DictionaryValue* dict =
prefs_->GetMutableDictionary(prefs::kPerHostZoomLevels);
- dict->SetWithoutPathExpansion(UTF8ToWide(host_),
- Value::CreateIntegerValue(kZoomLevel));
+ dict->SetWithoutPathExpansion(host_, Value::CreateIntegerValue(kZoomLevel));
scoped_refptr<HostZoomMap> map(new HostZoomMap(&profile_));
EXPECT_EQ(kZoomLevel, map->GetZoomLevel(url_));
}
@@ -78,14 +77,13 @@ TEST_F(HostZoomMapTest, SetZoomLevel) {
const DictionaryValue* dict =
prefs_->GetDictionary(prefs::kPerHostZoomLevels);
int zoom_level = 0;
- EXPECT_TRUE(dict->GetIntegerWithoutPathExpansion(UTF8ToWide(host_),
- &zoom_level));
+ EXPECT_TRUE(dict->GetIntegerWithoutPathExpansion(host_, &zoom_level));
EXPECT_EQ(kZoomLevel, zoom_level);
SetPrefObserverExpectation();
map->SetZoomLevel(url_, 0);
EXPECT_EQ(0, map->GetZoomLevel(url_));
- EXPECT_FALSE(dict->HasKey(UTF8ToWide(host_)));
+ EXPECT_FALSE(dict->HasKey(host_));
prefs_->RemovePrefObserver(prefs::kPerHostZoomLevels, &pref_observer_);
}
@@ -106,8 +104,7 @@ TEST_F(HostZoomMapTest, ReloadOnPrefChange) {
map->SetZoomLevel(url_, kZoomLevel);
DictionaryValue dict;
- dict.SetWithoutPathExpansion(UTF8ToWide(host_),
- Value::CreateIntegerValue(0));
+ dict.SetWithoutPathExpansion(host_, Value::CreateIntegerValue(0));
prefs_->Set(prefs::kPerHostZoomLevels, dict);
EXPECT_EQ(0, map->GetZoomLevel(url_));
}
generated by cgit v1.1 at 2025-02-15 06:14:45 +0000