summaryrefslogtreecommitdiffstats
path: root/gpu/command_buffer/service/mocks.h
diff options
context:
space:
mode:
authorapatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-01 22:24:14 +0000
committerapatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-01 22:24:14 +0000
commitf7a64eee4a7c9556a2199bebb4110f7cef9b6d3c (patch)
tree487908060385ef696fdcf5dc9078cbb4b5dcdf2b /gpu/command_buffer/service/mocks.h
parentc0c4565b3c287e7aca0ed2b913f82a74155fb813 (diff)
downloadchromium_src-f7a64eee4a7c9556a2199bebb4110f7cef9b6d3c.zip
chromium_src-f7a64eee4a7c9556a2199bebb4110f7cef9b6d3c.tar.gz
chromium_src-f7a64eee4a7c9556a2199bebb4110f7cef9b6d3c.tar.bz2
Renamed ParseError -> Error, parse_error -> error, kParseNoError -> kNoError, commandBufferEntries -> commandBufferSize.
Added NPDevice3DContextError enumeration. TEST=none BUG=none Review URL: http://codereview.chromium.org/558054 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37751 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/command_buffer/service/mocks.h')
-rw-r--r--gpu/command_buffer/service/mocks.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/gpu/command_buffer/service/mocks.h b/gpu/command_buffer/service/mocks.h
index c2b610a..a7eea11 100644
--- a/gpu/command_buffer/service/mocks.h
+++ b/gpu/command_buffer/service/mocks.h
@@ -22,8 +22,8 @@ namespace gpu {
class AsyncAPIMock : public AsyncAPIInterface {
public:
AsyncAPIMock() {
- testing::DefaultValue<parse_error::ParseError>::Set(
- parse_error::kParseNoError);
+ testing::DefaultValue<error::Error>::Set(
+ error::kNoError);
}
// Predicate that matches args passed to DoCommand, by looking at the values.
@@ -48,7 +48,7 @@ class AsyncAPIMock : public AsyncAPIInterface {
CommandBufferEntry *args_;
};
- MOCK_METHOD3(DoCommand, parse_error::ParseError(
+ MOCK_METHOD3(DoCommand, error::Error(
unsigned int command,
unsigned int arg_count,
const void* cmd_data));