diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-12-24 19:13:32 -0800 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-12-24 19:13:32 -0800 |
| commit | aa8bf7e42b8c73a9bc07ed6781364ba05f5a9776 (patch) | |
| tree | a5a435608eb527db39e2c9324737bd230e762030 /testing | |
| parent | 25ae22692cdd5b4ae4783ecb27eba79b3c794b2c (diff) | |
| download | pdfium-aa8bf7e42b8c73a9bc07ed6781364ba05f5a9776.tar.xz | |
Merge to XFA: Switch from nonstd::unique_ptr to std::unique_ptr.
TBR=thakis@chromium.org
Review URL: https://codereview.chromium.org/1547833002 .
(cherry picked from commit d20dfba2ae10e8aeb328328f09da79ff904110a8)
Review URL: https://codereview.chromium.org/1545183002 .
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/embedder_test.h | 4 | ||||
| -rw-r--r-- | testing/js_embedder_test.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/testing/embedder_test.h b/testing/embedder_test.h index df2e40a2e8..a544f26543 100644 --- a/testing/embedder_test.h +++ b/testing/embedder_test.h @@ -6,6 +6,7 @@ #define TESTING_EMBEDDER_TEST_H_ #include <map> +#include <memory> #include <string> #include "public/fpdf_dataavail.h" @@ -13,7 +14,6 @@ #include "public/fpdf_formfill.h" #include "public/fpdfview.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/base/nonstd_unique_ptr.h" #ifdef PDF_ENABLE_V8 #include "v8/include/v8.h" @@ -108,7 +108,7 @@ class EmbedderTest : public ::testing::Test, protected: Delegate* delegate_; - nonstd::unique_ptr<Delegate> default_delegate_; + std::unique_ptr<Delegate> default_delegate_; FPDF_DOCUMENT document_; FPDF_FORMHANDLE form_handle_; FPDF_AVAIL avail_; diff --git a/testing/js_embedder_test.h b/testing/js_embedder_test.h index 167aea7ed5..319bd40728 100644 --- a/testing/js_embedder_test.h +++ b/testing/js_embedder_test.h @@ -5,11 +5,11 @@ #ifndef TESTING_JS_EMBEDDER_TEST_H_ #define TESTING_JS_EMBEDDER_TEST_H_ +#include <memory> #include <vector> #include "fpdfsdk/include/jsapi/fxjs_v8.h" #include "testing/embedder_test.h" -#include "third_party/base/nonstd_unique_ptr.h" class JSEmbedderTest : public EmbedderTest { public: @@ -23,7 +23,7 @@ class JSEmbedderTest : public EmbedderTest { v8::Local<v8::Context> GetV8Context(); private: - nonstd::unique_ptr<FXJS_ArrayBufferAllocator> m_pArrayBufferAllocator; + std::unique_ptr<FXJS_ArrayBufferAllocator> m_pArrayBufferAllocator; v8::Isolate* m_pIsolate; v8::Global<v8::Context> m_pPersistentContext; std::vector<v8::Global<v8::Object>*> m_StaticObjects; |