commit 955930dce7e4b5c764cdd34b134baea4207de523
author Lei Zhang <thestig@chromium.org> Wed Nov 04 15:04:49 2015 -0800
committer Lei Zhang <thestig@chromium.org> Wed Nov 04 15:04:49 2015 -0800
tree 71076da6ecbdd1383714fea3684e523cc0c67809
parent 8cadf995e9a0fec8da19f69edac9d10fccca7eed

Fix the build after commit 8cadf995e9a0.

Do not store raw wide string pointers.

BUG=551248
R=tsepez@chromium.org

Review URL: https://codereview.chromium.org/1411043008 .

fpdfsdk/src/fpdfformfill_embeddertest.cpp

diff --git a/fpdfsdk/src/fpdfformfill_embeddertest.cpp b/fpdfsdk/src/fpdfformfill_embeddertest.cpp
index aef1b81..53cdcbd 100644
--- a/fpdfsdk/src/fpdfformfill_embeddertest.cpp
+++ b/fpdfsdk/src/fpdfformfill_embeddertest.cpp
@@ -6,7 +6,6 @@
 #include "../../testing/embedder_test.h"
 #include "../../testing/embedder_test_mock_delegate.h"
 #include "../../testing/embedder_test_timer_handling_delegate.h"
-#include "../../testing/test_support.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -79,10 +78,8 @@
   const auto& alerts = delegate.GetAlerts();
   ASSERT_EQ(1U, alerts.size());
 
-  std::wstring message = GetWideString(alerts[0].message);
-  std::wstring title = GetWideString(alerts[0].title);
-  EXPECT_STREQ(L"hello world", message.c_str());
-  EXPECT_STREQ(L"Alert", title.c_str());
+  EXPECT_STREQ(L"hello world", alerts[0].message.c_str());
+  EXPECT_STREQ(L"Alert", alerts[0].title.c_str());
   EXPECT_EQ(0, alerts[0].type);
   EXPECT_EQ(0, alerts[0].icon);
 }

testing/embedder_test_timer_handling_delegate.h

diff --git a/testing/embedder_test_timer_handling_delegate.h b/testing/embedder_test_timer_handling_delegate.h
index 0137aae..74e346e 100644
--- a/testing/embedder_test_timer_handling_delegate.h
+++ b/testing/embedder_test_timer_handling_delegate.h
@@ -6,10 +6,12 @@
 #define TESTING_EMBEDDER_TEST_TIMER_HANDLING_DELEGATE_H_
 
 #include <map>
+#include <string>
 #include <utility>
 #include <vector>
 
 #include "embedder_test.h"
+#include "test_support.h"
 
 class EmbedderTestTimerHandlingDelegate : public EmbedderTest::Delegate {
  public:
@@ -18,10 +20,13 @@
                   FPDF_WIDESTRING title_in,
                   int type_in,
                   int icon_in)
-        : message(message_in), title(title_in), type(type_in), icon(icon_in) {}
+        : type(type_in), icon(icon_in) {
+      message = GetWideString(message_in);
+      title = GetWideString(title_in);
+    }
 
-    FPDF_WIDESTRING message;
-    FPDF_WIDESTRING title;
+    std::wstring message;
+    std::wstring title;
     int type;
     int icon;
   };