From 1635bc1557f1a8612334cc274d4db3f25dddad51 Mon Sep 17 00:00:00 2001 From: "phajdan.jr@chromium.org" Date: Fri, 3 Apr 2009 17:18:27 +0000 Subject: Remove deprecated wstring ctor of JSONFileValueSerializer. Switched callers to FilePath. Review URL: http://codereview.chromium.org/62009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13089 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/extensions/extension_ui_unittest.cc | 2 +- chrome/browser/extensions/extension_unittest.cc | 2 +- chrome/browser/extensions/extensions_service.cc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'chrome/browser/extensions') diff --git a/chrome/browser/extensions/extension_ui_unittest.cc b/chrome/browser/extensions/extension_ui_unittest.cc index 3915e74..0e24832 100644 --- a/chrome/browser/extensions/extension_ui_unittest.cc +++ b/chrome/browser/extensions/extension_ui_unittest.cc @@ -15,7 +15,7 @@ namespace { std::string *error) { Value* value; - JSONFileValueSerializer serializer(path.ToWStringHack()); + JSONFileValueSerializer serializer(path); value = serializer.Deserialize(error); return static_cast(value); diff --git a/chrome/browser/extensions/extension_unittest.cc b/chrome/browser/extensions/extension_unittest.cc index 44e6106..5cde5ca 100644 --- a/chrome/browser/extensions/extension_unittest.cc +++ b/chrome/browser/extensions/extension_unittest.cc @@ -33,7 +33,7 @@ TEST(ExtensionTest, InitFromValueInvalid) { .AppendASCII("1") .AppendASCII(Extension::kManifestFilename); - JSONFileValueSerializer serializer(extensions_path.ToWStringHack()); + JSONFileValueSerializer serializer(extensions_path); scoped_ptr valid_value( static_cast(serializer.Deserialize(&error))); ASSERT_TRUE(valid_value.get()); diff --git a/chrome/browser/extensions/extensions_service.cc b/chrome/browser/extensions/extensions_service.cc index 11eff23..5c836d0 100644 --- a/chrome/browser/extensions/extensions_service.cc +++ b/chrome/browser/extensions/extensions_service.cc @@ -302,7 +302,7 @@ Extension* ExtensionsServiceBackend::LoadExtension( return NULL; } - JSONFileValueSerializer serializer(manifest_path.ToWStringHack()); + JSONFileValueSerializer serializer(manifest_path); std::string error; scoped_ptr root(serializer.Deserialize(&error)); if (!root.get()) { -- cgit v1.1