Index: content/shell/renderer/test_runner/TestPlugin.cpp |
diff --git a/content/shell/renderer/test_runner/TestPlugin.cpp b/content/shell/renderer/test_runner/TestPlugin.cpp |
index 22f56f5ad3d5035833e6e524b9f5acfd01ebb792..6edf08f50af860ab97705f9da014d0f3c0184a04 100644 |
--- a/content/shell/renderer/test_runner/TestPlugin.cpp |
+++ b/content/shell/renderer/test_runner/TestPlugin.cpp |
@@ -25,7 +25,6 @@ |
#include "third_party/WebKit/public/web/WebUserGestureIndicator.h" |
using namespace blink; |
-using namespace std; |
namespace content { |
@@ -477,14 +476,14 @@ void TestPlugin::destroyScene() |
bool TestPlugin::initProgram() |
{ |
- const string vertexSource( |
+ const std::string vertexSource( |
"attribute vec4 position; \n" |
"void main() { \n" |
" gl_Position = position; \n" |
"} \n" |
); |
- const string fragmentSource( |
+ const std::string fragmentSource( |
"precision mediump float; \n" |
"uniform vec4 color; \n" |
"void main() { \n" |
@@ -539,7 +538,7 @@ void TestPlugin::drawPrimitive() |
m_context->drawArrays(GL_TRIANGLES, 0, 3); |
} |
-unsigned TestPlugin::loadShader(unsigned type, const string& source) |
+unsigned TestPlugin::loadShader(unsigned type, const std::string& source) |
{ |
unsigned shader = m_context->createShader(type); |
if (shader) { |
@@ -556,7 +555,7 @@ unsigned TestPlugin::loadShader(unsigned type, const string& source) |
return shader; |
} |
-unsigned TestPlugin::loadProgram(const string& vertexSource, const string& fragmentSource) |
+unsigned TestPlugin::loadProgram(const std::string& vertexSource, const std::string& fragmentSource) |
{ |
unsigned vertexShader = loadShader(GL_VERTEX_SHADER, vertexSource); |
unsigned fragmentShader = loadShader(GL_FRAGMENT_SHADER, fragmentSource); |