Index: native_client_sdk/src/libraries/gtest_ppapi/gtest_runner.h |
diff --git a/native_client_sdk/src/libraries/c_salt/test/gtest_runner.h b/native_client_sdk/src/libraries/gtest_ppapi/gtest_runner.h |
similarity index 84% |
rename from native_client_sdk/src/libraries/c_salt/test/gtest_runner.h |
rename to native_client_sdk/src/libraries/gtest_ppapi/gtest_runner.h |
index 18f64bf78aac2224efdebd831bf15819c5db9be0..64745ea5a1ea91824a2037740e3aac7cdad12506 100644 |
--- a/native_client_sdk/src/libraries/c_salt/test/gtest_runner.h |
+++ b/native_client_sdk/src/libraries/gtest_ppapi/gtest_runner.h |
@@ -1,18 +1,16 @@ |
// 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. |
-#ifndef C_SALT_TEST_GTEST_RUNNER_H_ |
-#define C_SALT_TEST_GTEST_RUNNER_H_ |
+#ifndef GTEST_PPAPI_GTEST_RUNNER_H_ |
+#define GTEST_PPAPI_GTEST_RUNNER_H_ |
-#include "c_salt/threading/pthread_ext.h" |
-#include "c_salt/threading/thread_condition.h" |
+#include "gtest_ppapi/pthread_ext.h" |
+#include "gtest_ppapi/thread_condition.h" |
namespace pp { |
class Instance; |
} // namespace pp |
-namespace c_salt { |
- |
// GTestRunner is a threaded singleton for running gtest-based unit tests. |
class GTestRunner { |
public: |
@@ -49,14 +47,11 @@ class GTestRunner { |
// The status and associated status signal are used to control the state of |
// the thread run loop. |
enum Status { kIdle, kRunTests }; |
- c_salt::threading::ThreadCondition status_signal_; |
+ ThreadCondition status_signal_; |
Status status_; |
static pthread_t g_test_runner_thread_; |
static GTestRunner* gtest_runner_; |
}; |
-} // namespace c_salt |
- |
-#endif // C_SALT_TEST_GTEST_RUNNER_H_ |
- |
+#endif // GTEST_PPAPI_GTEST_RUNNER_H_ |