From aa8bf7e42b8c73a9bc07ed6781364ba05f5a9776 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Thu, 24 Dec 2015 19:13:32 -0800 Subject: 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 . --- testing/embedder_test.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'testing/embedder_test.h') 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 +#include #include #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 default_delegate_; + std::unique_ptr default_delegate_; FPDF_DOCUMENT document_; FPDF_FORMHANDLE form_handle_; FPDF_AVAIL avail_; -- cgit v1.2.3