diff options
| author | jbudorick <jbudorick@chromium.org> | 2015-05-21 19:54:57 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-05-22 02:55:28 +0000 |
| commit | 08b097a938942684558910dc9ca662c2a59ce3d2 (patch) | |
| tree | af312ac363fde0b33d7a5d5ab6e09c8e3beda68d /testing/android/native_test/native_test_util.h | |
| parent | 148c14c642a2a6cecea8be55edb89cc6e353e527 (diff) | |
| download | chromium_src-08b097a938942684558910dc9ca662c2a59ce3d2.zip chromium_src-08b097a938942684558910dc9ca662c2a59ce3d2.tar.gz chromium_src-08b097a938942684558910dc9ca662c2a59ce3d2.tar.bz2 | |
[Android] Refactor the native test wrappers. (RELAND)
This is a reland of https://codereview.chromium.org/1126543009/, which
broke gtests built by GN.
BUG=476410
Review URL: https://codereview.chromium.org/1143903002
Cr-Commit-Position: refs/heads/master@{#331056}
Diffstat (limited to 'testing/android/native_test/native_test_util.h')
| -rw-r--r-- | testing/android/native_test/native_test_util.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/testing/android/native_test/native_test_util.h b/testing/android/native_test/native_test_util.h index ef17e52..e647a92 100644 --- a/testing/android/native_test/native_test_util.h +++ b/testing/android/native_test/native_test_util.h @@ -12,7 +12,7 @@ // Helper methods for setting up environment for running gtest tests // inside an APK. namespace testing { -namespace native_test_util { +namespace android { class ScopedMainEntryLogger { public: @@ -33,7 +33,7 @@ void ParseArgsFromCommandLineFile( const char* path, std::vector<std::string>* args); int ArgsToArgv(const std::vector<std::string>& args, std::vector<char*>* argv); -} // namespace native_test_util +} // namespace android } // namespace testing #endif // TESTING_ANDROID_NATIVE_TEST_UTIL_ |