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

Unified Diff: webkit/tools/test_shell/test_shell.h

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/glue/webkitclient_impl.cc ('k') | webkit/tools/test_shell/test_shell_gtk.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/tools/test_shell/test_shell.h
diff --git a/webkit/tools/test_shell/test_shell.h b/webkit/tools/test_shell/test_shell.h
index b99cbeaa48128f7f7fad548c43de27e941b8ca06..5d14c5551bee4af446fb4dea23c75b97681a5c19 100644
--- a/webkit/tools/test_shell/test_shell.h
+++ b/webkit/tools/test_shell/test_shell.h
@@ -47,10 +47,13 @@
typedef std::list<gfx::NativeWindow> WindowList;
struct WebPreferences;
-class StringPiece;
class TestNavigationEntry;
class TestNavigationController;
+namespace base {
+class StringPiece;
+}
+
class TestShell {
public:
struct TestParams {
@@ -268,7 +271,7 @@ public:
static void ShowStartupDebuggingDialog();
// This is called indirectly by the network layer to access resources.
- static StringPiece NetResourceProvider(int key);
+ static base::StringPiece NetResourceProvider(int key);
protected:
bool Initialize(const GURL& starting_url);
« no previous file with comments | « webkit/glue/webkitclient_impl.cc ('k') | webkit/tools/test_shell/test_shell_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698