Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1285)

Unified Diff: third_party/WebKit/Source/platform/text/TextBreakIteratorTest.cpp

Issue 2967013002: Be explicit about namespace testing to not mix it with blink::testing (Closed)
Patch Set: Dropped mojo parts that need another review. Created 3 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/platform/text/TextBreakIteratorTest.cpp
diff --git a/third_party/WebKit/Source/platform/text/TextBreakIteratorTest.cpp b/third_party/WebKit/Source/platform/text/TextBreakIteratorTest.cpp
index 0a322f0206032eda5e338bd341a094ae4584a749..3d40703396ccfc08a301df320512f16ff45dd774 100644
--- a/third_party/WebKit/Source/platform/text/TextBreakIteratorTest.cpp
+++ b/third_party/WebKit/Source/platform/text/TextBreakIteratorTest.cpp
@@ -10,7 +10,7 @@
namespace blink {
-class TextBreakIteratorTest : public testing::Test {
+class TextBreakIteratorTest : public ::testing::Test {
protected:
void SetTestString(const char* test_string) {
test_string_ = String::FromUTF8(test_string);
@@ -40,7 +40,7 @@ class TextBreakIteratorTest : public testing::Test {
break_positions.push_back(i);
}
EXPECT_THAT(break_positions,
- testing::ElementsAreArray(expected_break_positions))
+ ::testing::ElementsAreArray(expected_break_positions))
<< break_iterator.BreakType() << " for " << test_string_;
}
@@ -54,7 +54,7 @@ class TextBreakIteratorTest : public testing::Test {
break_positions.push_back(i);
}
EXPECT_THAT(break_positions,
- testing::ElementsAreArray(expected_break_positions))
+ ::testing::ElementsAreArray(expected_break_positions))
<< break_iterator.BreakType() << " for " << test_string_;
}

Powered by Google App Engine
This is Rietveld 408576698