Merge to XFA: Get rid of gotos in CPDF_SyntaxParser and FlateUncompress().

core/include/fxcrt/fx_basic.h

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #ifndef CORE_INCLUDE_FXCRT_FX_BASIC_H_
 #define CORE_INCLUDE_FXCRT_FX_BASIC_H_
 
 #include "fx_memory.h"
@@ skipping 1047 matching lines @@
   FX_BOOL m_bEOF;
 
   FX_DWORD m_SrcPos;
 
   CFX_DataFilter* m_pDestFilter;
 };
 
 template <typename T>
 class CFX_AutoRestorer {
  public:
-  explicit CFX_AutoRestorer(T* location) {
-    m_Location = location;
-    m_OldValue = *location;
-  }
+  explicit CFX_AutoRestorer(T* location)
+      : m_Location(location), m_OldValue(*location) {}
   ~CFX_AutoRestorer() { *m_Location = m_OldValue; }
 
  private:
-  T* m_Location;
-  T m_OldValue;
+  T* const m_Location;
+  const T m_OldValue;
 };
 
 struct FxFreeDeleter {
   inline void operator()(void* ptr) const { FX_Free(ptr); }
 };
 
 // Used with nonstd::unique_ptr to Release() objects that can't be deleted.
 template <class T>
 struct ReleaseDeleter {
   inline void operator()(T* ptr) const { ptr->Release(); }
@@ skipping 200 matching lines @@
   FX_FLOAT c;
   FX_FLOAT d;
   FX_FLOAT e;
   FX_FLOAT f;
   FX_FLOAT g;
   FX_FLOAT h;
   FX_FLOAT i;
 };
 
 #endif  // CORE_INCLUDE_FXCRT_FX_BASIC_H_