commit c4d18aac0a4d65566652814402f6c4902e89395b
author Yuly Novikov <ynovikov@chromium.org> Thu Mar 09 18:45:02 2017 -0500
committer Commit Bot <commit-bot@chromium.org> Wed Jun 07 20:48:52 2017 +0000
tree 0d96dc18f46ecc749f16dc85be1a33deada407f6
parent 794607025b69599dd2607391cb13e51f39423f5d

Use ErrorStream everywhere

Eliminates one more usage of FormatString and its static initializer.

Add more ErrorStream types
and replace gl::Error and egl::Error with them.

BUG=angleproject:1644

Change-Id: Ib498d0ae4b81a332ec71aed7cf709993b154e6bb
Reviewed-on: https://chromium-review.googlesource.com/505429
Commit-Queue: Yuly Novikov <ynovikov@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>

src/libANGLE/validationES_unittest.cpp

diff --git a/src/libANGLE/validationES_unittest.cpp b/src/libANGLE/validationES_unittest.cpp
index 0085986..cf2ba1e 100644
--- a/src/libANGLE/validationES_unittest.cpp
+++ b/src/libANGLE/validationES_unittest.cpp
@@ -83,7 +83,7 @@
 
     NiceMock<MockTextureImpl> *textureImpl = new NiceMock<MockTextureImpl>();
     EXPECT_CALL(mockFactory, createTexture(_)).WillOnce(Return(textureImpl));
-    EXPECT_CALL(*textureImpl, setStorage(_, _, _, _, _)).WillOnce(Return(NoError()));
+    EXPECT_CALL(*textureImpl, setStorage(_, _, _, _, _)).WillOnce(Return(gl::NoError()));
     EXPECT_CALL(*textureImpl, destructor()).Times(1).RetiresOnSaturation();
 
     Texture *texture = new Texture(&mockFactory, 0, GL_TEXTURE_2D);
@@ -105,7 +105,7 @@
                                                 textureCaps, extensions, limitations, false);
 
     // Set the expectation for the validation error here.
-    Error expectedError(GL_INVALID_OPERATION, g_ExceedsMaxElementErrorMessage);
+    Error expectedError(gl::InvalidOperation() << g_ExceedsMaxElementErrorMessage);
     EXPECT_CALL(testContext, handleError(expectedError)).Times(1);
 
     // Call once with maximum index, and once with an excessive index.