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

Unified Diff: native_client_sdk/src/libraries/gtest_ppapi/gtest_module.cc

Issue 10854137: [NaCl SDK] gtest_ppapi library. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: remove hacks Created 8 years, 4 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/libraries/gtest_ppapi/gtest_module.cc
diff --git a/native_client_sdk/src/libraries/c_salt/test/gtest_module.cc b/native_client_sdk/src/libraries/gtest_ppapi/gtest_module.cc
similarity index 77%
rename from native_client_sdk/src/libraries/c_salt/test/gtest_module.cc
rename to native_client_sdk/src/libraries/gtest_ppapi/gtest_module.cc
index 9b34c6ed8ccfeab34d75754749bc81cfdf49e4b8..5affc916ab0433e3d0c246f9bf8e9ec002da373e 100644
--- a/native_client_sdk/src/libraries/c_salt/test/gtest_module.cc
+++ b/native_client_sdk/src/libraries/gtest_ppapi/gtest_module.cc
@@ -1,11 +1,9 @@
// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "c_salt/test/gtest_instance.h"
+#include "gtest_ppapi/gtest_instance.h"
#include "ppapi/cpp/module.h"
-namespace c_salt {
-
// GTestModule is a NaCl module dedicated to running gtest-based unit tests.
// It creates an NaCl instance based on GTestInstance.
class GTestModule : public pp::Module {
@@ -14,15 +12,14 @@ class GTestModule : public pp::Module {
~GTestModule() {}
virtual pp::Instance* CreateInstance(PP_Instance instance) {
- return new c_salt::GTestInstance(instance);
+ return new GTestInstance(instance);
}
};
-} // namespace c_salt
-
namespace pp {
+
Module* CreateModule() {
- return new c_salt::GTestModule();
+ return new GTestModule();
}
-} // namespace pp
+} // namespace pp

Powered by Google App Engine
This is Rietveld 408576698