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

Unified Diff: native_client_sdk/src/tests/nacl_io_test/kernel_proxy_test.cc

Issue 22842011: [NaCl SDK] Remove invalid assert from nacl_io. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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
Index: native_client_sdk/src/tests/nacl_io_test/kernel_proxy_test.cc
diff --git a/native_client_sdk/src/tests/nacl_io_test/kernel_proxy_test.cc b/native_client_sdk/src/tests/nacl_io_test/kernel_proxy_test.cc
index 18cc6a91106dda75cf76bd89a161ff9f30224464..3dbb8eb61ff6876ea676903935ae84844d8c6e2f 100644
--- a/native_client_sdk/src/tests/nacl_io_test/kernel_proxy_test.cc
+++ b/native_client_sdk/src/tests/nacl_io_test/kernel_proxy_test.cc
@@ -283,9 +283,10 @@ class MountMockInit : public MountMem {
};
class KernelProxyMountMock : public KernelProxy {
- virtual void Init(PepperInterface* ppapi) {
+ virtual Error Init(PepperInterface* ppapi) {
KernelProxy::Init(NULL);
factories_["initfs"] = new TypedMountFactory<MountMockInit>;
+ return 0;
}
};
@@ -378,9 +379,10 @@ class MountMockMMap : public Mount {
};
class KernelProxyMockMMap : public KernelProxy {
- virtual void Init(PepperInterface* ppapi) {
+ virtual Error Init(PepperInterface* ppapi) {
KernelProxy::Init(NULL);
factories_["mmapfs"] = new TypedMountFactory<MountMockMMap>;
+ return 0;
}
};
@@ -450,11 +452,12 @@ class KernelProxyError : public KernelProxy {
public:
KernelProxyError() : mnt_(new MountMock) {}
- virtual void Init(PepperInterface* ppapi) {
+ virtual Error Init(PepperInterface* ppapi) {
KernelProxy::Init(ppapi);
factories_["testfs"] = new SingletonMountFactory(mnt_);
EXPECT_CALL(*mnt_, Destroy()).Times(1);
+ return 0;
}
ScopedRef<MountMock> mnt() { return mnt_; }
« no previous file with comments | « native_client_sdk/src/libraries/nacl_io/kernel_wrap_newlib.cc ('k') | native_client_sdk/src/tools/common.mk » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698