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

Unified Diff: native_client_sdk/src/libraries/gtest_ppapi/gtest_instance.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_instance.cc
diff --git a/native_client_sdk/src/libraries/c_salt/test/gtest_instance.cc b/native_client_sdk/src/libraries/gtest_ppapi/gtest_instance.cc
similarity index 80%
rename from native_client_sdk/src/libraries/c_salt/test/gtest_instance.cc
rename to native_client_sdk/src/libraries/gtest_ppapi/gtest_instance.cc
index 0da1b702f84cc4f1c8fc380a852aa820679cde16..e80368e30f1e47799d078f9c6977e10f26093e88 100644
--- a/native_client_sdk/src/libraries/c_salt/test/gtest_instance.cc
+++ b/native_client_sdk/src/libraries/gtest_ppapi/gtest_instance.cc
@@ -2,12 +2,10 @@
// 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 "c_salt/test/gtest_runner.h"
+#include "gtest_ppapi/gtest_instance.h"
+#include "gtest_ppapi/gtest_runner.h"
#include "ppapi/cpp/var.h"
-namespace c_salt {
-
GTestInstance::GTestInstance(PP_Instance instance)
: pp::Instance(instance) {
}
@@ -19,7 +17,7 @@ bool GTestInstance::Init(uint32_t /* argc */, const char* /* argn */[],
const char* /* argv */[]) {
// Create a GTestRunner thread/singleton.
int local_argc = 0;
- c_salt::GTestRunner::CreateGTestRunnerThread(this, local_argc, NULL);
+ GTestRunner::CreateGTestRunnerThread(this, local_argc, NULL);
return true;
}
@@ -33,7 +31,7 @@ void GTestInstance::HandleMessage(const pp::Var& var_message) {
if (message == "RunGTest") {
// This is our signal to start running the tests. Results from the tests
// are posted through GTestEventListener.
- c_salt::GTestRunner::gtest_runner()->RunAllTests();
+ GTestRunner::gtest_runner()->RunAllTests();
} else {
std::string return_var;
return_var = "Unknown message ";
@@ -41,6 +39,3 @@ void GTestInstance::HandleMessage(const pp::Var& var_message) {
PostMessage(return_var);
}
}
-
-} // namespace c_salt
-

Powered by Google App Engine
This is Rietveld 408576698