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

Unified Diff: public/platform/WebCString.h

Issue 19047002: Allow tests within WebKit to implicitly convert WebCString to std::string. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@pinned
Patch Set: Define operator string and fromUTF16 in unittests Created 7 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: public/platform/WebCString.h
diff --git a/public/platform/WebCString.h b/public/platform/WebCString.h
index 81e2065fd347c9e03f2599f119bc667f07a4d22a..c80fc59d0aa410af57e4caf194f2398da939d72f 100644
--- a/public/platform/WebCString.h
+++ b/public/platform/WebCString.h
@@ -36,7 +36,8 @@
#if INSIDE_WEBKIT
#include <wtf/Forward.h>
-#else
+#endif
+#if !INSIDE_WEBKIT || defined(UNIT_TEST)
#include <string>
#endif
@@ -105,7 +106,8 @@ public:
assign(s.data(), s.length());
return *this;
}
-
+#endif
+#if !INSIDE_WEBKIT || defined(UNIT_TEST)
operator std::string() const
{
size_t len = length();
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698