Skip to content

Commit

Permalink
Update uses of UTF conversions in courgette/, device/, extensions/, g…
Browse files Browse the repository at this point in the history 
…oogle_apis/, gpu/, ipc/, media/, net/ to use the base:: namespace.

BUG=330556
TEST=no change
TBR=ben@chromium.org

Review URL: https://codereview.chromium.org/112963005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242496 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
avi@chromium.org committed Dec 25, 2013
1 parent 750f449 commit ad65a3e
Show file tree
Hide file tree
Showing 99 changed files with 269 additions and 219 deletions.
3 changes: 2 additions & 1 deletion courgette/encoded_program.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,8 @@ static FieldSelect GetFieldSelect() {
std::string s;
env->GetVar("A_FIELDS", &s);
if (!s.empty()) {
return static_cast<FieldSelect>(wcstoul(ASCIIToWide(s).c_str(), 0, 0));
return static_cast<FieldSelect>(
wcstoul(base::ASCIIToWide(s).c_str(), 0, 0));
}
#endif
return static_cast<FieldSelect>(~0);
Expand Down
6 changes: 3 additions & 3 deletions device/bluetooth/bluetooth_chromeos_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -749,7 +749,7 @@ TEST_F(BluetoothChromeOSTest, DeviceProperties) {
devices[0]->GetAddress());

// Verify the other device properties.
EXPECT_EQ(UTF8ToUTF16(FakeBluetoothDeviceClient::kPairedDeviceName),
EXPECT_EQ(base::UTF8ToUTF16(FakeBluetoothDeviceClient::kPairedDeviceName),
devices[0]->GetName());
EXPECT_EQ(BluetoothDevice::DEVICE_COMPUTER, devices[0]->GetDeviceType());
EXPECT_TRUE(devices[0]->IsPaired());
Expand Down Expand Up @@ -805,7 +805,7 @@ TEST_F(BluetoothChromeOSTest, DeviceNameChanged) {
ASSERT_EQ(1U, devices.size());
ASSERT_EQ(FakeBluetoothDeviceClient::kPairedDeviceAddress,
devices[0]->GetAddress());
ASSERT_EQ(UTF8ToUTF16(FakeBluetoothDeviceClient::kPairedDeviceName),
ASSERT_EQ(base::UTF8ToUTF16(FakeBluetoothDeviceClient::kPairedDeviceName),
devices[0]->GetName());

// Install an observer; expect the DeviceChanged method to be called when
Expand All @@ -823,7 +823,7 @@ TEST_F(BluetoothChromeOSTest, DeviceNameChanged) {
EXPECT_EQ(1, observer.device_changed_count_);
EXPECT_EQ(devices[0], observer.last_device_);

EXPECT_EQ(UTF8ToUTF16(new_name), devices[0]->GetName());
EXPECT_EQ(base::UTF8ToUTF16(new_name), devices[0]->GetName());
}

TEST_F(BluetoothChromeOSTest, DeviceUuidsChanged) {
Expand Down
4 changes: 2 additions & 2 deletions device/bluetooth/bluetooth_device.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@ BluetoothDevice::~BluetoothDevice() {
base::string16 BluetoothDevice::GetName() const {
std::string name = GetDeviceName();
if (!name.empty()) {
return UTF8ToUTF16(name);
return base::UTF8ToUTF16(name);
} else {
return GetAddressWithLocalizedDeviceTypeName();
}
}

base::string16 BluetoothDevice::GetAddressWithLocalizedDeviceTypeName() const {
base::string16 address_utf16 = UTF8ToUTF16(GetAddress());
base::string16 address_utf16 = base::UTF8ToUTF16(GetAddress());
BluetoothDevice::DeviceType device_type = GetDeviceType();
switch (device_type) {
case DEVICE_COMPUTER:
Expand Down
2 changes: 1 addition & 1 deletion device/bluetooth/test/mock_bluetooth_device.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ MockBluetoothDevice::MockBluetoothDevice(MockBluetoothAdapter* adapter,
ON_CALL(*this, IsConnecting())
.WillByDefault(testing::Return(false));
ON_CALL(*this, GetName())
.WillByDefault(testing::Return(UTF8ToUTF16(name_)));
.WillByDefault(testing::Return(base::UTF8ToUTF16(name_)));
ON_CALL(*this, ExpectingPinCode())
.WillByDefault(testing::Return(false));
ON_CALL(*this, ExpectingPasskey())
Expand Down
6 changes: 3 additions & 3 deletions extensions/browser/admin_policy.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ bool ManagementPolicyImpl(const extensions::Extension* extension,
if (error) {
*error = l10n_util::GetStringFUTF16(
IDS_EXTENSION_CANT_MODIFY_POLICY_REQUIRED,
UTF8ToUTF16(extension->name()));
base::UTF8ToUTF16(extension->name()));
}
return !modifiable_value;
}
Expand All @@ -35,8 +35,8 @@ bool ReturnLoadError(const extensions::Extension* extension,
if (error) {
*error = l10n_util::GetStringFUTF16(
IDS_EXTENSION_CANT_INSTALL_POLICY_BLOCKED,
UTF8ToUTF16(extension->name()),
UTF8ToUTF16(extension->id()));
base::UTF8ToUTF16(extension->name()),
base::UTF8ToUTF16(extension->id()));
}
return false;
}
Expand Down
14 changes: 7 additions & 7 deletions extensions/browser/management_policy_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,14 +180,14 @@ TEST_F(ManagementPolicyTest, MustRemainDisabled) {
TEST_F(ManagementPolicyTest, ErrorHandling) {
// The error parameter should be unchanged if no restriction was found.
std::string original_error = "Ceci est en effet une erreur.";
base::string16 original_error16 = UTF8ToUTF16(original_error);
base::string16 original_error16 = base::UTF8ToUTF16(original_error);
base::string16 error = original_error16;
EXPECT_TRUE(policy_.UserMayLoad(NULL, &error));
EXPECT_EQ(original_error, UTF16ToUTF8(error));
EXPECT_EQ(original_error, base::UTF16ToUTF8(error));
EXPECT_TRUE(policy_.UserMayModifySettings(NULL, &error));
EXPECT_EQ(original_error, UTF16ToUTF8(error));
EXPECT_EQ(original_error, base::UTF16ToUTF8(error));
EXPECT_FALSE(policy_.MustRemainEnabled(NULL, &error));
EXPECT_EQ(original_error, UTF16ToUTF8(error));
EXPECT_EQ(original_error, base::UTF16ToUTF8(error));

// Ensure no crashes if no error message was requested.
EXPECT_TRUE(policy_.UserMayLoad(NULL, NULL));
Expand All @@ -201,11 +201,11 @@ TEST_F(ManagementPolicyTest, ErrorHandling) {
// Make sure returned error is correct.
error = original_error16;
EXPECT_FALSE(policy_.UserMayLoad(NULL, &error));
EXPECT_EQ(UTF8ToUTF16(TestProvider::expected_error()), error);
EXPECT_EQ(base::UTF8ToUTF16(TestProvider::expected_error()), error);
error = original_error16;
EXPECT_FALSE(policy_.UserMayModifySettings(NULL, &error));
EXPECT_EQ(UTF8ToUTF16(TestProvider::expected_error()), error);
EXPECT_EQ(base::UTF8ToUTF16(TestProvider::expected_error()), error);
error = original_error16;
EXPECT_TRUE(policy_.MustRemainEnabled(NULL, &error));
EXPECT_EQ(UTF8ToUTF16(TestProvider::expected_error()), error);
EXPECT_EQ(base::UTF8ToUTF16(TestProvider::expected_error()), error);
}
4 changes: 2 additions & 2 deletions extensions/browser/test_management_policy.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ TestManagementPolicyProvider::TestManagementPolicyProvider()
must_remain_enabled_(false),
must_remain_disabled_(false),
disable_reason_(Extension::DISABLE_NONE) {
error_message_ = UTF8ToUTF16(expected_error());
error_message_ = base::UTF8ToUTF16(expected_error());
}

TestManagementPolicyProvider::TestManagementPolicyProvider(
int prohibited_actions) {
SetProhibitedActions(prohibited_actions);
error_message_ = UTF8ToUTF16(expected_error());
error_message_ = base::UTF8ToUTF16(expected_error());
}

void TestManagementPolicyProvider::SetProhibitedActions(
Expand Down
6 changes: 3 additions & 3 deletions extensions/common/error_utils.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ base::string16 ErrorUtils::FormatErrorMessageUTF16(const std::string& format,
const std::string& s1) {
std::string ret_val = format;
ReplaceFirstSubstringAfterOffset(&ret_val, 0, "*", s1);
return UTF8ToUTF16(ret_val);
return base::UTF8ToUTF16(ret_val);
}

base::string16 ErrorUtils::FormatErrorMessageUTF16(const std::string& format,
Expand All @@ -49,7 +49,7 @@ base::string16 ErrorUtils::FormatErrorMessageUTF16(const std::string& format,
std::string ret_val = format;
ReplaceFirstSubstringAfterOffset(&ret_val, 0, "*", s1);
ReplaceFirstSubstringAfterOffset(&ret_val, 0, "*", s2);
return UTF8ToUTF16(ret_val);
return base::UTF8ToUTF16(ret_val);
}

base::string16 ErrorUtils::FormatErrorMessageUTF16(const std::string& format,
Expand All @@ -60,7 +60,7 @@ base::string16 ErrorUtils::FormatErrorMessageUTF16(const std::string& format,
ReplaceFirstSubstringAfterOffset(&ret_val, 0, "*", s1);
ReplaceFirstSubstringAfterOffset(&ret_val, 0, "*", s2);
ReplaceFirstSubstringAfterOffset(&ret_val, 0, "*", s3);
return UTF8ToUTF16(ret_val);
return base::UTF8ToUTF16(ret_val);
}

} // namespace
32 changes: 16 additions & 16 deletions extensions/common/extension.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ scoped_refptr<Extension> Extension::Create(const base::FilePath& path,
location, scoped_ptr<base::DictionaryValue>(value.DeepCopy())));

if (!InitExtensionID(manifest.get(), path, explicit_id, flags, &error)) {
*utf8_error = UTF16ToUTF8(error);
*utf8_error = base::UTF16ToUTF8(error);
return NULL;
}

Expand All @@ -130,7 +130,7 @@ scoped_refptr<Extension> Extension::Create(const base::FilePath& path,
extension->install_warnings_.swap(install_warnings);

if (!extension->InitFromValue(flags, &error)) {
*utf8_error = UTF16ToUTF8(error);
*utf8_error = base::UTF16ToUTF8(error);
return NULL;
}

Expand Down Expand Up @@ -479,7 +479,7 @@ bool Extension::InitExtensionID(extensions::Manifest* manifest,
std::string public_key_bytes;
if (!manifest->GetString(keys::kPublicKey, &public_key) ||
!ParsePEMKeyBytes(public_key, &public_key_bytes)) {
*error = ASCIIToUTF16(errors::kInvalidKey);
*error = base::ASCIIToUTF16(errors::kInvalidKey);
return false;
}
std::string extension_id = id_util::GenerateId(public_key_bytes);
Expand All @@ -488,7 +488,7 @@ bool Extension::InitExtensionID(extensions::Manifest* manifest,
}

if (creation_flags & REQUIRE_KEY) {
*error = ASCIIToUTF16(errors::kInvalidKey);
*error = base::ASCIIToUTF16(errors::kInvalidKey);
return false;
} else {
// If there is a path, we generate the ID from it. This is useful for
Expand Down Expand Up @@ -575,24 +575,24 @@ bool Extension::LoadRequiredFeatures(base::string16* error) {
bool Extension::LoadName(base::string16* error) {
base::string16 localized_name;
if (!manifest_->GetString(keys::kName, &localized_name)) {
*error = ASCIIToUTF16(errors::kInvalidName);
*error = base::ASCIIToUTF16(errors::kInvalidName);
return false;
}
non_localized_name_ = UTF16ToUTF8(localized_name);
non_localized_name_ = base::UTF16ToUTF8(localized_name);
base::i18n::AdjustStringForLocaleDirection(&localized_name);
name_ = UTF16ToUTF8(localized_name);
name_ = base::UTF16ToUTF8(localized_name);
return true;
}

bool Extension::LoadVersion(base::string16* error) {
std::string version_str;
if (!manifest_->GetString(keys::kVersion, &version_str)) {
*error = ASCIIToUTF16(errors::kInvalidVersion);
*error = base::ASCIIToUTF16(errors::kInvalidVersion);
return false;
}
version_.reset(new base::Version(version_str));
if (!version_->IsValid() || version_->components().size() > 4) {
*error = ASCIIToUTF16(errors::kInvalidVersion);
*error = base::ASCIIToUTF16(errors::kInvalidVersion);
return false;
}
return true;
Expand All @@ -605,13 +605,13 @@ bool Extension::LoadAppFeatures(base::string16* error) {
}
if (manifest_->HasKey(keys::kDisplayInLauncher) &&
!manifest_->GetBoolean(keys::kDisplayInLauncher, &display_in_launcher_)) {
*error = ASCIIToUTF16(errors::kInvalidDisplayInLauncher);
*error = base::ASCIIToUTF16(errors::kInvalidDisplayInLauncher);
return false;
}
if (manifest_->HasKey(keys::kDisplayInNewTabPage)) {
if (!manifest_->GetBoolean(keys::kDisplayInNewTabPage,
&display_in_new_tab_page_)) {
*error = ASCIIToUTF16(errors::kInvalidDisplayInNewTabPage);
*error = base::ASCIIToUTF16(errors::kInvalidDisplayInNewTabPage);
return false;
}
} else {
Expand All @@ -632,7 +632,7 @@ bool Extension::LoadExtent(const char* key,

const base::ListValue* pattern_list = NULL;
if (!temp_pattern_value->GetAsList(&pattern_list)) {
*error = ASCIIToUTF16(list_error);
*error = base::ASCIIToUTF16(list_error);
return false;
}

Expand Down Expand Up @@ -707,7 +707,7 @@ bool Extension::LoadSharedFeatures(base::string16* error) {
bool Extension::LoadDescription(base::string16* error) {
if (manifest_->HasKey(keys::kDescription) &&
!manifest_->GetString(keys::kDescription, &description_)) {
*error = ASCIIToUTF16(errors::kInvalidDescription);
*error = base::ASCIIToUTF16(errors::kInvalidDescription);
return false;
}
return true;
Expand All @@ -720,7 +720,7 @@ bool Extension::LoadManifestVersion(base::string16* error) {
int manifest_version = 1;
if (!manifest_->GetInteger(keys::kManifestVersion, &manifest_version) ||
manifest_version < 1) {
*error = ASCIIToUTF16(errors::kInvalidManifestVersion);
*error = base::ASCIIToUTF16(errors::kInvalidManifestVersion);
return false;
}
}
Expand All @@ -746,12 +746,12 @@ bool Extension::LoadShortName(base::string16* error) {
base::string16 localized_short_name;
if (!manifest_->GetString(keys::kShortName, &localized_short_name) ||
localized_short_name.empty()) {
*error = ASCIIToUTF16(errors::kInvalidShortName);
*error = base::ASCIIToUTF16(errors::kInvalidShortName);
return false;
}

base::i18n::AdjustStringForLocaleDirection(&localized_short_name);
short_name_ = UTF16ToUTF8(localized_short_name);
short_name_ = base::UTF16ToUTF8(localized_short_name);
} else {
short_name_ = name_;
}
Expand Down
2 changes: 1 addition & 1 deletion extensions/common/manifest_handler_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ class ManifestHandlerTest : public testing::Test {
: TestManifestHandler(name, keys, prereqs, watcher) {
}
virtual bool Parse(Extension* extension, base::string16* error) OVERRIDE {
*error = ASCIIToUTF16(name_);
*error = base::ASCIIToUTF16(name_);
return false;
}
};
Expand Down
3 changes: 2 additions & 1 deletion extensions/common/manifest_handlers/background_info.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
#include "grit/generated_resources.h"
#include "ui/base/l10n/l10n_util.h"

using base::ASCIIToUTF16;
using base::DictionaryValue;

namespace extensions {
Expand Down Expand Up @@ -275,7 +276,7 @@ bool BackgroundManifestHandler::Validate(
extension->GetResource(background_scripts[i]).GetFilePath())) {
*error = l10n_util::GetStringFUTF8(
IDS_EXTENSION_LOAD_BACKGROUND_SCRIPT_FAILED,
UTF8ToUTF16(background_scripts[i]));
base::UTF8ToUTF16(background_scripts[i]));
return false;
}
}
Expand Down
6 changes: 3 additions & 3 deletions extensions/common/manifest_handlers/csp_info.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,17 +97,17 @@ bool CSPHandler::Parse(Extension* extension, base::string16* error) {

std::string content_security_policy;
if (!extension->manifest()->GetString(key, &content_security_policy)) {
*error = ASCIIToUTF16(errors::kInvalidContentSecurityPolicy);
*error = base::ASCIIToUTF16(errors::kInvalidContentSecurityPolicy);
return false;
}
if (!ContentSecurityPolicyIsLegal(content_security_policy)) {
*error = ASCIIToUTF16(errors::kInvalidContentSecurityPolicy);
*error = base::ASCIIToUTF16(errors::kInvalidContentSecurityPolicy);
return false;
}
if (extension->manifest_version() >= 2 &&
!ContentSecurityPolicyIsSecure(content_security_policy,
extension->GetType())) {
*error = ASCIIToUTF16(errors::kInsecureContentSecurityPolicy);
*error = base::ASCIIToUTF16(errors::kInsecureContentSecurityPolicy);
return false;
}

Expand Down
4 changes: 2 additions & 2 deletions extensions/common/manifest_handlers/incognito_info.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ bool IncognitoHandler::Parse(Extension* extension, base::string16* error) {
bool split_mode = false;
std::string incognito_string;
if (!extension->manifest()->GetString(keys::kIncognito, &incognito_string)) {
*error = ASCIIToUTF16(manifest_errors::kInvalidIncognitoBehavior);
*error = base::ASCIIToUTF16(manifest_errors::kInvalidIncognitoBehavior);
return false;
}

Expand All @@ -57,7 +57,7 @@ bool IncognitoHandler::Parse(Extension* extension, base::string16* error) {
else if (incognito_string != manifest_values::kIncognitoSpanning) {
// If incognito_string == kIncognitoSpanning, it is valid and
// split_mode remains false.
*error = ASCIIToUTF16(manifest_errors::kInvalidIncognitoBehavior);
*error = base::ASCIIToUTF16(manifest_errors::kInvalidIncognitoBehavior);
return false;
}

Expand Down
7 changes: 4 additions & 3 deletions extensions/common/manifest_handlers/kiosk_mode_info.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,19 +52,20 @@ bool KioskModeHandler::Parse(Extension* extension, base::string16* error) {
bool kiosk_enabled = false;
if (manifest->HasKey(keys::kKioskEnabled) &&
!manifest->GetBoolean(keys::kKioskEnabled, &kiosk_enabled)) {
*error = ASCIIToUTF16(manifest_errors::kInvalidKioskEnabled);
*error = base::ASCIIToUTF16(manifest_errors::kInvalidKioskEnabled);
return false;
}

bool kiosk_only = false;
if (manifest->HasKey(keys::kKioskOnly) &&
!manifest->GetBoolean(keys::kKioskOnly, &kiosk_only)) {
*error = ASCIIToUTF16(manifest_errors::kInvalidKioskOnly);
*error = base::ASCIIToUTF16(manifest_errors::kInvalidKioskOnly);
return false;
}

if (kiosk_only && !kiosk_enabled) {
*error = ASCIIToUTF16(manifest_errors::kInvalidKioskOnlyButNotEnabled);
*error = base::ASCIIToUTF16(
manifest_errors::kInvalidKioskOnlyButNotEnabled);
return false;
}

Expand Down
2 changes: 1 addition & 1 deletion extensions/common/manifest_handlers/offline_enabled_info.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ bool OfflineEnabledHandler::Parse(Extension* extension, base::string16* error) {

if (!extension->manifest()->GetBoolean(keys::kOfflineEnabled,
&offline_enabled)) {
*error = ASCIIToUTF16(manifest_errors::kInvalidOfflineEnabled);
*error = base::ASCIIToUTF16(manifest_errors::kInvalidOfflineEnabled);
return false;
}

Expand Down
4 changes: 2 additions & 2 deletions extensions/common/manifest_handlers/requirements_info.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ bool RequirementsHandler::Parse(Extension* extension, base::string16* error) {
const base::DictionaryValue* requirements_value = NULL;
if (!extension->manifest()->GetDictionary(keys::kRequirements,
&requirements_value)) {
*error = ASCIIToUTF16(errors::kInvalidRequirements);
*error = base::ASCIIToUTF16(errors::kInvalidRequirements);
return false;
}

Expand Down Expand Up @@ -129,7 +129,7 @@ bool RequirementsHandler::Parse(Extension* extension, base::string16* error) {
}
}
} else {
*error = ASCIIToUTF16(errors::kInvalidRequirements);
*error = base::ASCIIToUTF16(errors::kInvalidRequirements);
return false;
}
}
Expand Down
Loading

0 comments on commit ad65a3e

Please sign in to comment.