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

Unified Diff: native_client_sdk/src/libraries/gtest_ppapi/gtest_nacl_environment.h

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_nacl_environment.h
diff --git a/native_client_sdk/src/libraries/c_salt/test/gtest_nacl_environment.h b/native_client_sdk/src/libraries/gtest_ppapi/gtest_nacl_environment.h
similarity index 80%
rename from native_client_sdk/src/libraries/c_salt/test/gtest_nacl_environment.h
rename to native_client_sdk/src/libraries/gtest_ppapi/gtest_nacl_environment.h
index 35a6043c1745e0c40437912614af8f601166a12e..759b775d2e7ec4c57d4b135bdaa4f0937375c26f 100644
--- a/native_client_sdk/src/libraries/c_salt/test/gtest_nacl_environment.h
+++ b/native_client_sdk/src/libraries/gtest_ppapi/gtest_nacl_environment.h
@@ -2,8 +2,8 @@
// 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_NACL_ENVIRONMENT_H_
-#define C_SALT_TEST_GTEST_NACL_ENVIRONMENT_H_
+#ifndef GTEST_PPAPI_GTEST_NACL_ENVIRONMENT_H_
+#define GTEST_PPAPI_GTEST_NACL_ENVIRONMENT_H_
#include <cassert>
#include "gtest/gtest.h"
@@ -12,8 +12,6 @@ namespace pp {
class Instance;
} // namespace pp
-namespace c_salt {
-
// A custom environment for NaCl gtest.
class GTestNaclEnvironment : public ::testing::Environment {
public:
@@ -33,7 +31,4 @@ class GTestNaclEnvironment : public ::testing::Environment {
static pp::Instance* global_instance_;
};
-} // namespace c_salt
-
-#endif // C_SALT_TEST_GTEST_NACL_ENVIRONMENT_H_
-
+#endif // GTEST_PPAPI_GTEST_NACL_ENVIRONMENT_H_

Powered by Google App Engine
This is Rietveld 408576698