diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-25 18:18:01 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-25 18:18:01 +0000 |
| commit | ad65a3ee540552ecca50ebbf9382f1a4c718d383 (patch) | |
| tree | 68082d6d78331413eba2f799547026940c07e004 /extensions/common/stack_frame_unittest.cc | |
| parent | 750f4497a3b87a4a028d4d6ce3ce88e01314139c (diff) | |
| download | chromium_src-ad65a3ee540552ecca50ebbf9382f1a4c718d383.zip chromium_src-ad65a3ee540552ecca50ebbf9382f1a4c718d383.tar.gz chromium_src-ad65a3ee540552ecca50ebbf9382f1a4c718d383.tar.bz2 | |
Update uses of UTF conversions in courgette/, device/, extensions/, google_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
Diffstat (limited to 'extensions/common/stack_frame_unittest.cc')
| -rw-r--r-- | extensions/common/stack_frame_unittest.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/extensions/common/stack_frame_unittest.cc b/extensions/common/stack_frame_unittest.cc index 7dad047..ddd92ae 100644 --- a/extensions/common/stack_frame_unittest.cc +++ b/extensions/common/stack_frame_unittest.cc @@ -21,18 +21,18 @@ void AssertStackFrameValid(const std::string& text, size_t column, const std::string& source, const std::string& function) { - base::string16 utf16_text = UTF8ToUTF16(text); + base::string16 utf16_text = base::UTF8ToUTF16(text); scoped_ptr<StackFrame> frame = StackFrame::CreateFromText(utf16_text); ASSERT_TRUE(frame.get()) << "Failed to create frame from '" << text << "'"; EXPECT_EQ(line, frame->line_number()); EXPECT_EQ(column, frame->column_number()); - EXPECT_EQ(UTF8ToUTF16(source), frame->source()); - EXPECT_EQ(UTF8ToUTF16(function), frame->function()); + EXPECT_EQ(base::UTF8ToUTF16(source), frame->source()); + EXPECT_EQ(base::UTF8ToUTF16(function), frame->function()); } void AssertStackFrameInvalid(const std::string& text) { - base::string16 utf16_text = UTF8ToUTF16(text); + base::string16 utf16_text = base::UTF8ToUTF16(text); scoped_ptr<StackFrame> frame = StackFrame::CreateFromText(utf16_text); ASSERT_FALSE(frame.get()) << "Errantly created frame from '" << text << "'"; } |