Index: native_client_sdk/src/libraries/gtest_ppapi/gtest_event_listener.h |
diff --git a/native_client_sdk/src/libraries/c_salt/test/gtest_event_listener.h b/native_client_sdk/src/libraries/gtest_ppapi/gtest_event_listener.h |
similarity index 80% |
rename from native_client_sdk/src/libraries/c_salt/test/gtest_event_listener.h |
rename to native_client_sdk/src/libraries/gtest_ppapi/gtest_event_listener.h |
index 39f5139a2f441bb4d5d20bc651c2f9f569c01ea1..1af4c221cf352386cd63144a1df08d1194a91720 100644 |
--- a/native_client_sdk/src/libraries/c_salt/test/gtest_event_listener.h |
+++ b/native_client_sdk/src/libraries/gtest_ppapi/gtest_event_listener.h |
@@ -1,20 +1,19 @@ |
// 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_EVENT_LISTENER_H_ |
-#define C_SALT_TEST_GTEST_EVENT_LISTENER_H_ |
+#ifndef GTEST_PPAPI_GTEST_EVENT_LISTENER_H_ |
+#define GTEST_PPAPI_GTEST_EVENT_LISTENER_H_ |
#include <string> |
-#include "c_salt/threading/ref_count.h" |
+ |
#include "gtest/gtest.h" |
-#include "ppapi/cpp/completion_callback.h" |
+#include "gtest_ppapi/ref_count.h" |
+#include "ppapi/utility/completion_callback_factory.h" |
namespace pp { |
class Instance; |
} // namespace pp |
-namespace c_salt { |
- |
// GTestEventListener is a gtest event listener that performs two functions: |
// 1. It redirects output to PostMessage rather than printf, so that test events |
// are dispatched to JS. |
@@ -42,10 +41,7 @@ class GTestEventListener : public ::testing::EmptyTestEventListener { |
void PostMessageCallback(int32_t result, const std::string& str); |
pp::Instance* instance_; |
- pp::CompletionCallbackFactory<GTestEventListener, |
- ::threading::RefCount> factory_; |
+ pp::CompletionCallbackFactory<GTestEventListener> factory_; |
}; |
-} // namespace c_salt |
-#endif // C_SALT_TEST_GTEST_EVENT_LISTENER_H_ |
- |
+#endif // GTEST_PPAPI_GTEST_EVENT_LISTENER_H_ |