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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: sky/engine/wtf/text/StringOperatorsTest.cpp

Issue 722723003: Re-land 714393002 after fixing android build. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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
« no previous file with comments | « sky/engine/wtf/text/StringImpl.h ('k') | sky/engine/wtf/text/WTFString.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/wtf/text/StringOperatorsTest.cpp
diff --git a/sky/engine/wtf/text/StringOperatorsTest.cpp b/sky/engine/wtf/text/StringOperatorsTest.cpp
index e27c82e652513225db70e16e6f58b6c42440ce12..73af2791dd4d8f873d8f9f74244ca556fa953b93 100644
--- a/sky/engine/wtf/text/StringOperatorsTest.cpp
+++ b/sky/engine/wtf/text/StringOperatorsTest.cpp
@@ -148,41 +148,6 @@ TEST(WTF, DISABLED_StringOperators)
EXPECT_N_WTF_STRING_COPIES(2, atomicString + literal + string + literal);
EXPECT_N_WTF_STRING_COPIES(2, atomicString + (literal + string + literal));
EXPECT_N_WTF_STRING_COPIES(2, (atomicString + literal) + (string + literal));
-
-#if COMPILER(MSVC)
- EXPECT_N_WTF_STRING_COPIES(1, L"wide string" + string);
- EXPECT_N_WTF_STRING_COPIES(1, string + L"wide string");
- EXPECT_N_WTF_STRING_COPIES(1, L"wide string" + atomicString);
- EXPECT_N_WTF_STRING_COPIES(1, atomicString + L"wide string");
-
- EXPECT_N_WTF_STRING_COPIES(2, L"wide string" + string + L"wide string" + string);
- EXPECT_N_WTF_STRING_COPIES(2, L"wide string" + (string + L"wide string" + string));
- EXPECT_N_WTF_STRING_COPIES(2, (L"wide string" + string) + (L"wide string" + string));
- EXPECT_N_WTF_STRING_COPIES(2, string + L"wide string" + string + L"wide string");
- EXPECT_N_WTF_STRING_COPIES(2, string + (L"wide string" + string + L"wide string"));
- EXPECT_N_WTF_STRING_COPIES(2, (string + L"wide string") + (string + L"wide string"));
-
- EXPECT_N_WTF_STRING_COPIES(2, L"wide string" + atomicString + L"wide string" + atomicString);
- EXPECT_N_WTF_STRING_COPIES(2, L"wide string" + (atomicString + L"wide string" + atomicString));
- EXPECT_N_WTF_STRING_COPIES(2, (L"wide string" + atomicString) + (L"wide string" + atomicString));
- EXPECT_N_WTF_STRING_COPIES(2, atomicString + L"wide string" + atomicString + L"wide string");
- EXPECT_N_WTF_STRING_COPIES(2, atomicString + (L"wide string" + atomicString + L"wide string"));
- EXPECT_N_WTF_STRING_COPIES(2, (atomicString + L"wide string") + (atomicString + L"wide string"));
-
- EXPECT_N_WTF_STRING_COPIES(2, L"wide string" + string + L"wide string" + atomicString);
- EXPECT_N_WTF_STRING_COPIES(2, L"wide string" + (string + L"wide string" + atomicString));
- EXPECT_N_WTF_STRING_COPIES(2, (L"wide string" + string) + (L"wide string" + atomicString));
- EXPECT_N_WTF_STRING_COPIES(2, string + L"wide string" + atomicString + L"wide string");
- EXPECT_N_WTF_STRING_COPIES(2, string + (L"wide string" + atomicString + L"wide string"));
- EXPECT_N_WTF_STRING_COPIES(2, (string + L"wide string") + (atomicString + L"wide string"));
-
- EXPECT_N_WTF_STRING_COPIES(2, L"wide string" + atomicString + L"wide string" + string);
- EXPECT_N_WTF_STRING_COPIES(2, L"wide string" + (atomicString + L"wide string" + string));
- EXPECT_N_WTF_STRING_COPIES(2, (L"wide string" + atomicString) + (L"wide string" + string));
- EXPECT_N_WTF_STRING_COPIES(2, atomicString + L"wide string" + string + L"wide string");
- EXPECT_N_WTF_STRING_COPIES(2, atomicString + (L"wide string" + string + L"wide string"));
- EXPECT_N_WTF_STRING_COPIES(2, (atomicString + L"wide string") + (string + L"wide string"));
-#endif
}
} // namespace
« no previous file with comments | « sky/engine/wtf/text/StringImpl.h ('k') | sky/engine/wtf/text/WTFString.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698