Convert fpdfformfill to use CPDFSDK_FormFillEnvironment

fpdfsdk/fsdk_baseform_embeddertest.cpp

Index: fpdfsdk/fsdk_baseform_embeddertest.cpp
diff --git a/fpdfsdk/fsdk_baseform_embeddertest.cpp b/fpdfsdk/fsdk_baseform_embeddertest.cpp
index 66ee156a7e67949d764328051b6e0247c6e739ac..a11453b1ec7eba91f74e1a549226ebcd9914be89 100644
--- a/fpdfsdk/fsdk_baseform_embeddertest.cpp
+++ b/fpdfsdk/fsdk_baseform_embeddertest.cpp
@@ -5,6 +5,7 @@
 #include "fpdfsdk/cba_annotiterator.h"
 #include "fpdfsdk/cpdfsdk_annot.h"
 #include "fpdfsdk/cpdfsdk_document.h"
+#include "fpdfsdk/cpdfsdk_formfillenvironment.h"
 #include "fpdfsdk/fsdk_define.h"
 #include "testing/embedder_test.h"
 #include "testing/embedder_test_mock_delegate.h"
@@ -39,11 +40,12 @@ TEST_F(FSDKBaseFormEmbeddertest, CBA_AnnotIterator) {
   CFX_FloatRect LeftTop(201, 400, 221, 420);
   CFX_FloatRect RightTop(401, 401, 421, 421);
 
-  CPDFSDK_Document* pSDKDoc =
-      CPDFSDK_Document::FromFPDFFormHandle(form_handle());
+  CPDFSDK_FormFillEnvironment* pFormFillEnv =
+      static_cast<CPDFSDK_FormFillEnvironment*>(form_handle());
+
   {
     // Page 0 specifies "row order".
-    CBA_AnnotIterator iter(pSDKDoc->GetPageView(0),
+    CBA_AnnotIterator iter(pFormFillEnv->GetSDKDocument()->GetPageView(0),
                            CPDF_Annot::Subtype::WIDGET);
     CPDFSDK_Annot* pAnnot = iter.GetFirstAnnot();
     CheckRect(pAnnot->GetRect(), RightTop);
@@ -69,7 +71,7 @@ TEST_F(FSDKBaseFormEmbeddertest, CBA_AnnotIterator) {
   }
   {
     // Page 1 specifies "column order"
-    CBA_AnnotIterator iter(pSDKDoc->GetPageView(1),
+    CBA_AnnotIterator iter(pFormFillEnv->GetSDKDocument()->GetPageView(1),
                            CPDF_Annot::Subtype::WIDGET);
     CPDFSDK_Annot* pAnnot = iter.GetFirstAnnot();
     CheckRect(pAnnot->GetRect(), RightTop);
@@ -95,7 +97,7 @@ TEST_F(FSDKBaseFormEmbeddertest, CBA_AnnotIterator) {
   }
   {
     // Page 2 specifies "struct order"
-    CBA_AnnotIterator iter(pSDKDoc->GetPageView(2),
+    CBA_AnnotIterator iter(pFormFillEnv->GetSDKDocument()->GetPageView(2),
                            CPDF_Annot::Subtype::WIDGET);
     CPDFSDK_Annot* pAnnot = iter.GetFirstAnnot();
     CheckRect(pAnnot->GetRect(), LeftBottom);