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

Unified Diff: webkit/tools/test_shell/test_worker/test_worker_main.cc

Issue 193072: Move StringPiece into the base namespace. It is colliding (Closed)
Patch Set: take 2 Created 11 years, 3 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 | « webkit/tools/test_shell/test_shell_win.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/tools/test_shell/test_worker/test_worker_main.cc
diff --git a/webkit/tools/test_shell/test_worker/test_worker_main.cc b/webkit/tools/test_shell/test_worker/test_worker_main.cc
index 1002fbe6cd2f792516e8fe8345fd207b12db0365..94c966d3cd9a88e68dac0b8eeb3beed5bf5cd69f 100644
--- a/webkit/tools/test_shell/test_worker/test_worker_main.cc
+++ b/webkit/tools/test_shell/test_worker/test_worker_main.cc
@@ -166,8 +166,8 @@ string16 GetLocalizedString(int message_id) {
return EmptyString16();
}
-StringPiece GetDataResource(int resource_id) {
- return StringPiece();
+base::StringPiece GetDataResource(int resource_id) {
+ return base::StringPiece();
}
void SetMediaPlayerAvailable(bool value) {
« no previous file with comments | « webkit/tools/test_shell/test_shell_win.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698