Apply clang-format to all C, C++ and ObjC files (issue #2171)

2025-06-05 21:39:12 +02:00 · 2017-05-17 11:29:28 +02:00
parent a566549e04
commit 31d9407ee2
1331 changed files with 33014 additions and 32258 deletions
--- a/libcef_dll/ctocpp/test/translator_test_ctocpp.cc
+++ b/libcef_dll/ctocpp/test/translator_test_ctocpp.cc
@@ -9,20 +9,21 @@
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
+// $hash=abbba0b09a8c13d342b51a2b8cfbc363fde99ca2$
+//

 #include <algorithm>
-#include "libcef_dll/cpptoc/test/translator_test_ref_ptr_client_cpptoc.h"
 #include "libcef_dll/cpptoc/test/translator_test_ref_ptr_client_child_cpptoc.h"
-#include "libcef_dll/cpptoc/test/translator_test_scoped_client_cpptoc.h"
+#include "libcef_dll/cpptoc/test/translator_test_ref_ptr_client_cpptoc.h"
 #include "libcef_dll/cpptoc/test/translator_test_scoped_client_child_cpptoc.h"
+#include "libcef_dll/cpptoc/test/translator_test_scoped_client_cpptoc.h"
 #include "libcef_dll/ctocpp/test/translator_test_ctocpp.h"
-#include "libcef_dll/ctocpp/test/translator_test_ref_ptr_library_ctocpp.h"
 #include "libcef_dll/ctocpp/test/translator_test_ref_ptr_library_child_ctocpp.h"
-#include "libcef_dll/ctocpp/test/translator_test_scoped_library_ctocpp.h"
+#include "libcef_dll/ctocpp/test/translator_test_ref_ptr_library_ctocpp.h"
 #include "libcef_dll/ctocpp/test/translator_test_scoped_library_child_ctocpp.h"
+#include "libcef_dll/ctocpp/test/translator_test_scoped_library_ctocpp.h"
 #include "libcef_dll/transfer_util.h"

-
 // STATIC METHODS - Body may be edited by hand.

 CefRefPtr<CefTranslatorTest> CefTranslatorTest::Create() {
@@ -35,7 +36,6 @@ CefRefPtr<CefTranslatorTest> CefTranslatorTest::Create() {
  return CefTranslatorTestCToCpp::Wrap(_retval);
 }

-
 // VIRTUAL METHODS - Body may be edited by hand.

 void CefTranslatorTestCToCpp::GetVoid() {
@@ -60,7 +60,7 @@ bool CefTranslatorTestCToCpp::GetBool() {
  int _retval = _struct->get_bool(_struct);

  // Return type: bool
-  return _retval?true:false;
+  return _retval ? true : false;
 }

 int CefTranslatorTestCToCpp::GetInt() {
@@ -130,7 +130,7 @@ bool CefTranslatorTestCToCpp::SetVoid() {
  int _retval = _struct->set_void(_struct);

  // Return type: bool
-  return _retval?true:false;
+  return _retval ? true : false;
 }

 bool CefTranslatorTestCToCpp::SetBool(bool val) {
@@ -141,11 +141,10 @@ bool CefTranslatorTestCToCpp::SetBool(bool val) {
  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING

  // Execute
-  int _retval = _struct->set_bool(_struct,
-      val);
+  int _retval = _struct->set_bool(_struct, val);

  // Return type: bool
-  return _retval?true:false;
+  return _retval ? true : false;
 }

 bool CefTranslatorTestCToCpp::SetInt(int val) {
@@ -156,11 +155,10 @@ bool CefTranslatorTestCToCpp::SetInt(int val) {
  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING

  // Execute
-  int _retval = _struct->set_int(_struct,
-      val);
+  int _retval = _struct->set_int(_struct, val);

  // Return type: bool
-  return _retval?true:false;
+  return _retval ? true : false;
 }

 bool CefTranslatorTestCToCpp::SetDouble(double val) {
@@ -171,11 +169,10 @@ bool CefTranslatorTestCToCpp::SetDouble(double val) {
  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING

  // Execute
-  int _retval = _struct->set_double(_struct,
-      val);
+  int _retval = _struct->set_double(_struct, val);

  // Return type: bool
-  return _retval?true:false;
+  return _retval ? true : false;
 }

 bool CefTranslatorTestCToCpp::SetLong(long val) {
@@ -186,11 +183,10 @@ bool CefTranslatorTestCToCpp::SetLong(long val) {
  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING

  // Execute
-  int _retval = _struct->set_long(_struct,
-      val);
+  int _retval = _struct->set_long(_struct, val);

  // Return type: bool
-  return _retval?true:false;
+  return _retval ? true : false;
 }

 bool CefTranslatorTestCToCpp::SetSizet(size_t val) {
@@ -201,11 +197,10 @@ bool CefTranslatorTestCToCpp::SetSizet(size_t val) {
  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING

  // Execute
-  int _retval = _struct->set_sizet(_struct,
-      val);
+  int _retval = _struct->set_sizet(_struct, val);

  // Return type: bool
-  return _retval?true:false;
+  return _retval ? true : false;
 }

 bool CefTranslatorTestCToCpp::SetIntList(const std::vector<int>& val) {
@@ -229,16 +224,14 @@ bool CefTranslatorTestCToCpp::SetIntList(const std::vector<int>& val) {
  }

  // Execute
-  int _retval = _struct->set_int_list(_struct,
-      valCount,
-      valList);
+  int _retval = _struct->set_int_list(_struct, valCount, valList);

  // Restore param:val; type: simple_vec_byref_const
  if (valList)
-    delete [] valList;
+    delete[] valList;

  // Return type: bool
-  return _retval?true:false;
+  return _retval ? true : false;
 }

 bool CefTranslatorTestCToCpp::GetIntListByRef(IntList& val) {
@@ -256,7 +249,7 @@ bool CefTranslatorTestCToCpp::GetIntListByRef(IntList& val) {
    valList = new int[valCount];
    DCHECK(valList);
    if (valList) {
-       memset(valList, 0, sizeof(int)*valCount);
+      memset(valList, 0, sizeof(int) * valCount);
    }
    if (valList && valSize > 0) {
      for (size_t i = 0; i < valSize; ++i) {
@@ -266,9 +259,7 @@ bool CefTranslatorTestCToCpp::GetIntListByRef(IntList& val) {
  }

  // Execute
-  int _retval = _struct->get_int_list_by_ref(_struct,
-      &valCount,
-      valList);
+  int _retval = _struct->get_int_list_by_ref(_struct, &valCount, valList);

  // Restore param:val; type: simple_vec_byref
  val.clear();
@@ -276,11 +267,11 @@ bool CefTranslatorTestCToCpp::GetIntListByRef(IntList& val) {
    for (size_t i = 0; i < valCount; ++i) {
      val.push_back(valList[i]);
    }
-    delete [] valList;
+    delete[] valList;
  }

  // Return type: bool
-  return _retval?true:false;
+  return _retval ? true : false;
 }

 size_t CefTranslatorTestCToCpp::GetIntListSize() {
@@ -326,11 +317,10 @@ bool CefTranslatorTestCToCpp::SetString(const CefString& val) {
    return false;

  // Execute
-  int _retval = _struct->set_string(_struct,
-      val.GetStruct());
+  int _retval = _struct->set_string(_struct, val.GetStruct());

  // Return type: bool
-  return _retval?true:false;
+  return _retval ? true : false;
 }

 void CefTranslatorTestCToCpp::GetStringByRef(CefString& val) {
@@ -341,8 +331,7 @@ void CefTranslatorTestCToCpp::GetStringByRef(CefString& val) {
  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING

  // Execute
-  _struct->get_string_by_ref(_struct,
-      val.GetWritableStruct());
+  _struct->get_string_by_ref(_struct, val.GetWritableStruct());
 }

 bool CefTranslatorTestCToCpp::SetStringList(const std::vector<CefString>& val) {
@@ -359,15 +348,14 @@ bool CefTranslatorTestCToCpp::SetStringList(const std::vector<CefString>& val) {
    transfer_string_list_contents(val, valList);

  // Execute
-  int _retval = _struct->set_string_list(_struct,
-      valList);
+  int _retval = _struct->set_string_list(_struct, valList);

  // Restore param:val; type: string_vec_byref_const
  if (valList)
    cef_string_list_free(valList);

  // Return type: bool
-  return _retval?true:false;
+  return _retval ? true : false;
 }

 bool CefTranslatorTestCToCpp::GetStringListByRef(StringList& val) {
@@ -384,8 +372,7 @@ bool CefTranslatorTestCToCpp::GetStringListByRef(StringList& val) {
    transfer_string_list_contents(val, valList);

  // Execute
-  int _retval = _struct->get_string_list_by_ref(_struct,
-      valList);
+  int _retval = _struct->get_string_list_by_ref(_struct, valList);

  // Restore param:val; type: string_vec_byref
  if (valList) {
@@ -395,7 +382,7 @@ bool CefTranslatorTestCToCpp::GetStringListByRef(StringList& val) {
  }

  // Return type: bool
-  return _retval?true:false;
+  return _retval ? true : false;
 }

 bool CefTranslatorTestCToCpp::SetStringMap(const StringMap& val) {
@@ -412,19 +399,18 @@ bool CefTranslatorTestCToCpp::SetStringMap(const StringMap& val) {
    transfer_string_map_contents(val, valMap);

  // Execute
-  int _retval = _struct->set_string_map(_struct,
-      valMap);
+  int _retval = _struct->set_string_map(_struct, valMap);

  // Restore param:val; type: string_map_single_byref_const
  if (valMap)
    cef_string_map_free(valMap);

  // Return type: bool
-  return _retval?true:false;
+  return _retval ? true : false;
 }

-bool CefTranslatorTestCToCpp::GetStringMapByRef(std::map<CefString,
-    CefString>& val) {
+bool CefTranslatorTestCToCpp::GetStringMapByRef(
+    std::map<CefString, CefString>& val) {
  cef_translator_test_t* _struct = GetStruct();
  if (CEF_MEMBER_MISSING(_struct, get_string_map_by_ref))
    return false;
@@ -438,8 +424,7 @@ bool CefTranslatorTestCToCpp::GetStringMapByRef(std::map<CefString,
    transfer_string_map_contents(val, valMap);

  // Execute
-  int _retval = _struct->get_string_map_by_ref(_struct,
-      valMap);
+  int _retval = _struct->get_string_map_by_ref(_struct, valMap);

  // Restore param:val; type: string_map_single_byref
  if (valMap) {
@@ -449,11 +434,11 @@ bool CefTranslatorTestCToCpp::GetStringMapByRef(std::map<CefString,
  }

  // Return type: bool
-  return _retval?true:false;
+  return _retval ? true : false;
 }

-bool CefTranslatorTestCToCpp::SetStringMultimap(const std::multimap<CefString,
-    CefString>& val) {
+bool CefTranslatorTestCToCpp::SetStringMultimap(
+    const std::multimap<CefString, CefString>& val) {
  cef_translator_test_t* _struct = GetStruct();
  if (CEF_MEMBER_MISSING(_struct, set_string_multimap))
    return false;
@@ -467,15 +452,14 @@ bool CefTranslatorTestCToCpp::SetStringMultimap(const std::multimap<CefString,
    transfer_string_multimap_contents(val, valMultimap);

  // Execute
-  int _retval = _struct->set_string_multimap(_struct,
-      valMultimap);
+  int _retval = _struct->set_string_multimap(_struct, valMultimap);

  // Restore param:val; type: string_map_multi_byref_const
  if (valMultimap)
    cef_string_multimap_free(valMultimap);

  // Return type: bool
-  return _retval?true:false;
+  return _retval ? true : false;
 }

 bool CefTranslatorTestCToCpp::GetStringMultimapByRef(StringMultimap& val) {
@@ -492,8 +476,7 @@ bool CefTranslatorTestCToCpp::GetStringMultimapByRef(StringMultimap& val) {
    transfer_string_multimap_contents(val, valMultimap);

  // Execute
-  int _retval = _struct->get_string_multimap_by_ref(_struct,
-      valMultimap);
+  int _retval = _struct->get_string_multimap_by_ref(_struct, valMultimap);

  // Restore param:val; type: string_map_multi_byref
  if (valMultimap) {
@@ -503,7 +486,7 @@ bool CefTranslatorTestCToCpp::GetStringMultimapByRef(StringMultimap& val) {
  }

  // Return type: bool
-  return _retval?true:false;
+  return _retval ? true : false;
 }

 CefPoint CefTranslatorTestCToCpp::GetPoint() {
@@ -528,11 +511,10 @@ bool CefTranslatorTestCToCpp::SetPoint(const CefPoint& val) {
  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING

  // Execute
-  int _retval = _struct->set_point(_struct,
-      &val);
+  int _retval = _struct->set_point(_struct, &val);

  // Return type: bool
-  return _retval?true:false;
+  return _retval ? true : false;
 }

 void CefTranslatorTestCToCpp::GetPointByRef(CefPoint& val) {
@@ -543,8 +525,7 @@ void CefTranslatorTestCToCpp::GetPointByRef(CefPoint& val) {
  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING

  // Execute
-  _struct->get_point_by_ref(_struct,
-      &val);
+  _struct->get_point_by_ref(_struct, &val);
 }

 bool CefTranslatorTestCToCpp::SetPointList(const std::vector<CefPoint>& val) {
@@ -568,16 +549,14 @@ bool CefTranslatorTestCToCpp::SetPointList(const std::vector<CefPoint>& val) {
  }

  // Execute
-  int _retval = _struct->set_point_list(_struct,
-      valCount,
-      valList);
+  int _retval = _struct->set_point_list(_struct, valCount, valList);

  // Restore param:val; type: simple_vec_byref_const
  if (valList)
-    delete [] valList;
+    delete[] valList;

  // Return type: bool
-  return _retval?true:false;
+  return _retval ? true : false;
 }

 bool CefTranslatorTestCToCpp::GetPointListByRef(PointList& val) {
@@ -595,7 +574,7 @@ bool CefTranslatorTestCToCpp::GetPointListByRef(PointList& val) {
    valList = new cef_point_t[valCount];
    DCHECK(valList);
    if (valList) {
-       memset(valList, 0, sizeof(cef_point_t)*valCount);
+      memset(valList, 0, sizeof(cef_point_t) * valCount);
    }
    if (valList && valSize > 0) {
      for (size_t i = 0; i < valSize; ++i) {
@@ -605,9 +584,7 @@ bool CefTranslatorTestCToCpp::GetPointListByRef(PointList& val) {
  }

  // Execute
-  int _retval = _struct->get_point_list_by_ref(_struct,
-      &valCount,
-      valList);
+  int _retval = _struct->get_point_list_by_ref(_struct, &valCount, valList);

  // Restore param:val; type: simple_vec_byref
  val.clear();
@@ -615,11 +592,11 @@ bool CefTranslatorTestCToCpp::GetPointListByRef(PointList& val) {
    for (size_t i = 0; i < valCount; ++i) {
      val.push_back(valList[i]);
    }
-    delete [] valList;
+    delete[] valList;
  }

  // Return type: bool
-  return _retval?true:false;
+  return _retval ? true : false;
 }

 size_t CefTranslatorTestCToCpp::GetPointListSize() {
@@ -636,8 +613,8 @@ size_t CefTranslatorTestCToCpp::GetPointListSize() {
  return _retval;
 }

-CefRefPtr<CefTranslatorTestRefPtrLibrary> CefTranslatorTestCToCpp::GetRefPtrLibrary(
-    int val) {
+CefRefPtr<CefTranslatorTestRefPtrLibrary>
+CefTranslatorTestCToCpp::GetRefPtrLibrary(int val) {
  cef_translator_test_t* _struct = GetStruct();
  if (CEF_MEMBER_MISSING(_struct, get_ref_ptr_library))
    return NULL;
@@ -645,9 +622,8 @@ CefRefPtr<CefTranslatorTestRefPtrLibrary> CefTranslatorTestCToCpp::GetRefPtrLibr
  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING

  // Execute
-  cef_translator_test_ref_ptr_library_t* _retval = _struct->get_ref_ptr_library(
-      _struct,
-      val);
+  cef_translator_test_ref_ptr_library_t* _retval =
+      _struct->get_ref_ptr_library(_struct, val);

  // Return type: refptr_same
  return CefTranslatorTestRefPtrLibraryCToCpp::Wrap(_retval);
@@ -667,14 +643,15 @@ int CefTranslatorTestCToCpp::SetRefPtrLibrary(
    return 0;

  // Execute
-  int _retval = _struct->set_ref_ptr_library(_struct,
-      CefTranslatorTestRefPtrLibraryCToCpp::Unwrap(val));
+  int _retval = _struct->set_ref_ptr_library(
+      _struct, CefTranslatorTestRefPtrLibraryCToCpp::Unwrap(val));

  // Return type: simple
  return _retval;
 }

-CefRefPtr<CefTranslatorTestRefPtrLibrary> CefTranslatorTestCToCpp::SetRefPtrLibraryAndReturn(
+CefRefPtr<CefTranslatorTestRefPtrLibrary>
+CefTranslatorTestCToCpp::SetRefPtrLibraryAndReturn(
    CefRefPtr<CefTranslatorTestRefPtrLibrary> val) {
  cef_translator_test_t* _struct = GetStruct();
  if (CEF_MEMBER_MISSING(_struct, set_ref_ptr_library_and_return))
@@ -689,8 +666,8 @@ CefRefPtr<CefTranslatorTestRefPtrLibrary> CefTranslatorTestCToCpp::SetRefPtrLibr

  // Execute
  cef_translator_test_ref_ptr_library_t* _retval =
-      _struct->set_ref_ptr_library_and_return(_struct,
-      CefTranslatorTestRefPtrLibraryCToCpp::Unwrap(val));
+      _struct->set_ref_ptr_library_and_return(
+          _struct, CefTranslatorTestRefPtrLibraryCToCpp::Unwrap(val));

  // Return type: refptr_same
  return CefTranslatorTestRefPtrLibraryCToCpp::Wrap(_retval);
@@ -710,14 +687,15 @@ int CefTranslatorTestCToCpp::SetChildRefPtrLibrary(
    return 0;

  // Execute
-  int _retval = _struct->set_child_ref_ptr_library(_struct,
-      CefTranslatorTestRefPtrLibraryChildCToCpp::Unwrap(val));
+  int _retval = _struct->set_child_ref_ptr_library(
+      _struct, CefTranslatorTestRefPtrLibraryChildCToCpp::Unwrap(val));

  // Return type: simple
  return _retval;
 }

-CefRefPtr<CefTranslatorTestRefPtrLibrary> CefTranslatorTestCToCpp::SetChildRefPtrLibraryAndReturnParent(
+CefRefPtr<CefTranslatorTestRefPtrLibrary>
+CefTranslatorTestCToCpp::SetChildRefPtrLibraryAndReturnParent(
    CefRefPtr<CefTranslatorTestRefPtrLibraryChild> val) {
  cef_translator_test_t* _struct = GetStruct();
  if (CEF_MEMBER_MISSING(_struct, set_child_ref_ptr_library_and_return_parent))
@@ -732,15 +710,16 @@ CefRefPtr<CefTranslatorTestRefPtrLibrary> CefTranslatorTestCToCpp::SetChildRefPt

  // Execute
  cef_translator_test_ref_ptr_library_t* _retval =
-      _struct->set_child_ref_ptr_library_and_return_parent(_struct,
-      CefTranslatorTestRefPtrLibraryChildCToCpp::Unwrap(val));
+      _struct->set_child_ref_ptr_library_and_return_parent(
+          _struct, CefTranslatorTestRefPtrLibraryChildCToCpp::Unwrap(val));

  // Return type: refptr_same
  return CefTranslatorTestRefPtrLibraryCToCpp::Wrap(_retval);
 }

 bool CefTranslatorTestCToCpp::SetRefPtrLibraryList(
-    const std::vector<CefRefPtr<CefTranslatorTestRefPtrLibrary>>& val, int val1,
+    const std::vector<CefRefPtr<CefTranslatorTestRefPtrLibrary>>& val,
+    int val1,
    int val2) {
  cef_translator_test_t* _struct = GetStruct();
  if (CEF_MEMBER_MISSING(_struct, set_ref_ptr_library_list))
@@ -762,22 +741,20 @@ bool CefTranslatorTestCToCpp::SetRefPtrLibraryList(
  }

  // Execute
-  int _retval = _struct->set_ref_ptr_library_list(_struct,
-      valCount,
-      valList,
-      val1,
-      val2);
+  int _retval =
+      _struct->set_ref_ptr_library_list(_struct, valCount, valList, val1, val2);

  // Restore param:val; type: refptr_vec_same_byref_const
  if (valList)
-    delete [] valList;
+    delete[] valList;

  // Return type: bool
-  return _retval?true:false;
+  return _retval ? true : false;
 }

 bool CefTranslatorTestCToCpp::GetRefPtrLibraryListByRef(RefPtrLibraryList& val,
-    int val1, int val2) {
+                                                        int val1,
+                                                        int val2) {
  cef_translator_test_t* _struct = GetStruct();
  if (CEF_MEMBER_MISSING(_struct, get_ref_ptr_library_list_by_ref))
    return false;
@@ -792,8 +769,8 @@ bool CefTranslatorTestCToCpp::GetRefPtrLibraryListByRef(RefPtrLibraryList& val,
    valList = new cef_translator_test_ref_ptr_library_t*[valCount];
    DCHECK(valList);
    if (valList) {
-       memset(valList, 0, sizeof(
-           cef_translator_test_ref_ptr_library_t*)*valCount);
+      memset(valList, 0,
+             sizeof(cef_translator_test_ref_ptr_library_t*) * valCount);
    }
    if (valList && valSize > 0) {
      for (size_t i = 0; i < valSize; ++i) {
@@ -803,11 +780,8 @@ bool CefTranslatorTestCToCpp::GetRefPtrLibraryListByRef(RefPtrLibraryList& val,
  }

  // Execute
-  int _retval = _struct->get_ref_ptr_library_list_by_ref(_struct,
-      &valCount,
-      valList,
-      val1,
-      val2);
+  int _retval = _struct->get_ref_ptr_library_list_by_ref(_struct, &valCount,
+                                                         valList, val1, val2);

  // Restore param:val; type: refptr_vec_same_byref
  val.clear();
@@ -815,11 +789,11 @@ bool CefTranslatorTestCToCpp::GetRefPtrLibraryListByRef(RefPtrLibraryList& val,
    for (size_t i = 0; i < valCount; ++i) {
      val.push_back(CefTranslatorTestRefPtrLibraryCToCpp::Wrap(valList[i]));
    }
-    delete [] valList;
+    delete[] valList;
  }

  // Return type: bool
-  return _retval?true:false;
+  return _retval ? true : false;
 }

 size_t CefTranslatorTestCToCpp::GetRefPtrLibraryListSize() {
@@ -850,14 +824,15 @@ int CefTranslatorTestCToCpp::SetRefPtrClient(
    return 0;

  // Execute
-  int _retval = _struct->set_ref_ptr_client(_struct,
-      CefTranslatorTestRefPtrClientCppToC::Wrap(val));
+  int _retval = _struct->set_ref_ptr_client(
+      _struct, CefTranslatorTestRefPtrClientCppToC::Wrap(val));

  // Return type: simple
  return _retval;
 }

-CefRefPtr<CefTranslatorTestRefPtrClient> CefTranslatorTestCToCpp::SetRefPtrClientAndReturn(
+CefRefPtr<CefTranslatorTestRefPtrClient>
+CefTranslatorTestCToCpp::SetRefPtrClientAndReturn(
    CefRefPtr<CefTranslatorTestRefPtrClient> val) {
  cef_translator_test_t* _struct = GetStruct();
  if (CEF_MEMBER_MISSING(_struct, set_ref_ptr_client_and_return))
@@ -872,8 +847,8 @@ CefRefPtr<CefTranslatorTestRefPtrClient> CefTranslatorTestCToCpp::SetRefPtrClien

  // Execute
  cef_translator_test_ref_ptr_client_t* _retval =
-      _struct->set_ref_ptr_client_and_return(_struct,
-      CefTranslatorTestRefPtrClientCppToC::Wrap(val));
+      _struct->set_ref_ptr_client_and_return(
+          _struct, CefTranslatorTestRefPtrClientCppToC::Wrap(val));

  // Return type: refptr_diff
  return CefTranslatorTestRefPtrClientCppToC::Unwrap(_retval);
@@ -893,14 +868,15 @@ int CefTranslatorTestCToCpp::SetChildRefPtrClient(
    return 0;

  // Execute
-  int _retval = _struct->set_child_ref_ptr_client(_struct,
-      CefTranslatorTestRefPtrClientChildCppToC::Wrap(val));
+  int _retval = _struct->set_child_ref_ptr_client(
+      _struct, CefTranslatorTestRefPtrClientChildCppToC::Wrap(val));

  // Return type: simple
  return _retval;
 }

-CefRefPtr<CefTranslatorTestRefPtrClient> CefTranslatorTestCToCpp::SetChildRefPtrClientAndReturnParent(
+CefRefPtr<CefTranslatorTestRefPtrClient>
+CefTranslatorTestCToCpp::SetChildRefPtrClientAndReturnParent(
    CefRefPtr<CefTranslatorTestRefPtrClientChild> val) {
  cef_translator_test_t* _struct = GetStruct();
  if (CEF_MEMBER_MISSING(_struct, set_child_ref_ptr_client_and_return_parent))
@@ -915,15 +891,16 @@ CefRefPtr<CefTranslatorTestRefPtrClient> CefTranslatorTestCToCpp::SetChildRefPtr

  // Execute
  cef_translator_test_ref_ptr_client_t* _retval =
-      _struct->set_child_ref_ptr_client_and_return_parent(_struct,
-      CefTranslatorTestRefPtrClientChildCppToC::Wrap(val));
+      _struct->set_child_ref_ptr_client_and_return_parent(
+          _struct, CefTranslatorTestRefPtrClientChildCppToC::Wrap(val));

  // Return type: refptr_diff
  return CefTranslatorTestRefPtrClientCppToC::Unwrap(_retval);
 }

 bool CefTranslatorTestCToCpp::SetRefPtrClientList(
-    const std::vector<CefRefPtr<CefTranslatorTestRefPtrClient>>& val, int val1,
+    const std::vector<CefRefPtr<CefTranslatorTestRefPtrClient>>& val,
+    int val1,
    int val2) {
  cef_translator_test_t* _struct = GetStruct();
  if (CEF_MEMBER_MISSING(_struct, set_ref_ptr_client_list))
@@ -945,21 +922,19 @@ bool CefTranslatorTestCToCpp::SetRefPtrClientList(
  }

  // Execute
-  int _retval = _struct->set_ref_ptr_client_list(_struct,
-      valCount,
-      valList,
-      val1,
-      val2);
+  int _retval =
+      _struct->set_ref_ptr_client_list(_struct, valCount, valList, val1, val2);

  // Restore param:val; type: refptr_vec_diff_byref_const
  if (valList)
-    delete [] valList;
+    delete[] valList;

  // Return type: bool
-  return _retval?true:false;
+  return _retval ? true : false;
 }

-bool CefTranslatorTestCToCpp::GetRefPtrClientListByRef(RefPtrClientList& val,
+bool CefTranslatorTestCToCpp::GetRefPtrClientListByRef(
+    RefPtrClientList& val,
    CefRefPtr<CefTranslatorTestRefPtrClient> val1,
    CefRefPtr<CefTranslatorTestRefPtrClient> val2) {
  cef_translator_test_t* _struct = GetStruct();
@@ -985,8 +960,8 @@ bool CefTranslatorTestCToCpp::GetRefPtrClientListByRef(RefPtrClientList& val,
    valList = new cef_translator_test_ref_ptr_client_t*[valCount];
    DCHECK(valList);
    if (valList) {
-       memset(valList, 0, sizeof(
-           cef_translator_test_ref_ptr_client_t*)*valCount);
+      memset(valList, 0,
+             sizeof(cef_translator_test_ref_ptr_client_t*) * valCount);
    }
    if (valList && valSize > 0) {
      for (size_t i = 0; i < valSize; ++i) {
@@ -996,9 +971,8 @@ bool CefTranslatorTestCToCpp::GetRefPtrClientListByRef(RefPtrClientList& val,
  }

  // Execute
-  int _retval = _struct->get_ref_ptr_client_list_by_ref(_struct,
-      &valCount,
-      valList,
+  int _retval = _struct->get_ref_ptr_client_list_by_ref(
+      _struct, &valCount, valList,
      CefTranslatorTestRefPtrClientCppToC::Wrap(val1),
      CefTranslatorTestRefPtrClientCppToC::Wrap(val2));

@@ -1008,11 +982,11 @@ bool CefTranslatorTestCToCpp::GetRefPtrClientListByRef(RefPtrClientList& val,
    for (size_t i = 0; i < valCount; ++i) {
      val.push_back(CefTranslatorTestRefPtrClientCppToC::Unwrap(valList[i]));
    }
-    delete [] valList;
+    delete[] valList;
  }

  // Return type: bool
-  return _retval?true:false;
+  return _retval ? true : false;
 }

 size_t CefTranslatorTestCToCpp::GetRefPtrClientListSize() {
@@ -1029,8 +1003,8 @@ size_t CefTranslatorTestCToCpp::GetRefPtrClientListSize() {
  return _retval;
 }

-CefOwnPtr<CefTranslatorTestScopedLibrary> CefTranslatorTestCToCpp::GetOwnPtrLibrary(
-    int val) {
+CefOwnPtr<CefTranslatorTestScopedLibrary>
+CefTranslatorTestCToCpp::GetOwnPtrLibrary(int val) {
  cef_translator_test_t* _struct = GetStruct();
  if (CEF_MEMBER_MISSING(_struct, get_own_ptr_library))
    return CefOwnPtr<CefTranslatorTestScopedLibrary>();
@@ -1038,9 +1012,8 @@ CefOwnPtr<CefTranslatorTestScopedLibrary> CefTranslatorTestCToCpp::GetOwnPtrLibr
  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING

  // Execute
-  cef_translator_test_scoped_library_t* _retval = _struct->get_own_ptr_library(
-      _struct,
-      val);
+  cef_translator_test_scoped_library_t* _retval =
+      _struct->get_own_ptr_library(_struct, val);

  // Return type: ownptr_same
  return CefTranslatorTestScopedLibraryCToCpp::Wrap(_retval);
@@ -1060,14 +1033,15 @@ int CefTranslatorTestCToCpp::SetOwnPtrLibrary(
    return 0;

  // Execute
-  int _retval = _struct->set_own_ptr_library(_struct,
-      CefTranslatorTestScopedLibraryCToCpp::UnwrapOwn(OWN_PASS(val)));
+  int _retval = _struct->set_own_ptr_library(
+      _struct, CefTranslatorTestScopedLibraryCToCpp::UnwrapOwn(OWN_PASS(val)));

  // Return type: simple
  return _retval;
 }

-CefOwnPtr<CefTranslatorTestScopedLibrary> CefTranslatorTestCToCpp::SetOwnPtrLibraryAndReturn(
+CefOwnPtr<CefTranslatorTestScopedLibrary>
+CefTranslatorTestCToCpp::SetOwnPtrLibraryAndReturn(
    CefOwnPtr<CefTranslatorTestScopedLibrary> val) {
  cef_translator_test_t* _struct = GetStruct();
  if (CEF_MEMBER_MISSING(_struct, set_own_ptr_library_and_return))
@@ -1082,8 +1056,9 @@ CefOwnPtr<CefTranslatorTestScopedLibrary> CefTranslatorTestCToCpp::SetOwnPtrLibr

  // Execute
  cef_translator_test_scoped_library_t* _retval =
-      _struct->set_own_ptr_library_and_return(_struct,
-      CefTranslatorTestScopedLibraryCToCpp::UnwrapOwn(OWN_PASS(val)));
+      _struct->set_own_ptr_library_and_return(
+          _struct,
+          CefTranslatorTestScopedLibraryCToCpp::UnwrapOwn(OWN_PASS(val)));

  // Return type: ownptr_same
  return CefTranslatorTestScopedLibraryCToCpp::Wrap(_retval);
@@ -1103,14 +1078,16 @@ int CefTranslatorTestCToCpp::SetChildOwnPtrLibrary(
    return 0;

  // Execute
-  int _retval = _struct->set_child_own_ptr_library(_struct,
+  int _retval = _struct->set_child_own_ptr_library(
+      _struct,
      CefTranslatorTestScopedLibraryChildCToCpp::UnwrapOwn(OWN_PASS(val)));

  // Return type: simple
  return _retval;
 }

-CefOwnPtr<CefTranslatorTestScopedLibrary> CefTranslatorTestCToCpp::SetChildOwnPtrLibraryAndReturnParent(
+CefOwnPtr<CefTranslatorTestScopedLibrary>
+CefTranslatorTestCToCpp::SetChildOwnPtrLibraryAndReturnParent(
    CefOwnPtr<CefTranslatorTestScopedLibraryChild> val) {
  cef_translator_test_t* _struct = GetStruct();
  if (CEF_MEMBER_MISSING(_struct, set_child_own_ptr_library_and_return_parent))
@@ -1125,8 +1102,9 @@ CefOwnPtr<CefTranslatorTestScopedLibrary> CefTranslatorTestCToCpp::SetChildOwnPt

  // Execute
  cef_translator_test_scoped_library_t* _retval =
-      _struct->set_child_own_ptr_library_and_return_parent(_struct,
-      CefTranslatorTestScopedLibraryChildCToCpp::UnwrapOwn(OWN_PASS(val)));
+      _struct->set_child_own_ptr_library_and_return_parent(
+          _struct,
+          CefTranslatorTestScopedLibraryChildCToCpp::UnwrapOwn(OWN_PASS(val)));

  // Return type: ownptr_same
  return CefTranslatorTestScopedLibraryCToCpp::Wrap(_retval);
@@ -1146,14 +1124,15 @@ int CefTranslatorTestCToCpp::SetOwnPtrClient(
    return 0;

  // Execute
-  int _retval = _struct->set_own_ptr_client(_struct,
-      CefTranslatorTestScopedClientCppToC::WrapOwn(OWN_PASS(val)));
+  int _retval = _struct->set_own_ptr_client(
+      _struct, CefTranslatorTestScopedClientCppToC::WrapOwn(OWN_PASS(val)));

  // Return type: simple
  return _retval;
 }

-CefOwnPtr<CefTranslatorTestScopedClient> CefTranslatorTestCToCpp::SetOwnPtrClientAndReturn(
+CefOwnPtr<CefTranslatorTestScopedClient>
+CefTranslatorTestCToCpp::SetOwnPtrClientAndReturn(
    CefOwnPtr<CefTranslatorTestScopedClient> val) {
  cef_translator_test_t* _struct = GetStruct();
  if (CEF_MEMBER_MISSING(_struct, set_own_ptr_client_and_return))
@@ -1168,8 +1147,8 @@ CefOwnPtr<CefTranslatorTestScopedClient> CefTranslatorTestCToCpp::SetOwnPtrClien

  // Execute
  cef_translator_test_scoped_client_t* _retval =
-      _struct->set_own_ptr_client_and_return(_struct,
-      CefTranslatorTestScopedClientCppToC::WrapOwn(OWN_PASS(val)));
+      _struct->set_own_ptr_client_and_return(
+          _struct, CefTranslatorTestScopedClientCppToC::WrapOwn(OWN_PASS(val)));

  // Return type: ownptr_diff
  return CefTranslatorTestScopedClientCppToC::UnwrapOwn(_retval);
@@ -1189,14 +1168,16 @@ int CefTranslatorTestCToCpp::SetChildOwnPtrClient(
    return 0;

  // Execute
-  int _retval = _struct->set_child_own_ptr_client(_struct,
+  int _retval = _struct->set_child_own_ptr_client(
+      _struct,
      CefTranslatorTestScopedClientChildCppToC::WrapOwn(OWN_PASS(val)));

  // Return type: simple
  return _retval;
 }

-CefOwnPtr<CefTranslatorTestScopedClient> CefTranslatorTestCToCpp::SetChildOwnPtrClientAndReturnParent(
+CefOwnPtr<CefTranslatorTestScopedClient>
+CefTranslatorTestCToCpp::SetChildOwnPtrClientAndReturnParent(
    CefOwnPtr<CefTranslatorTestScopedClientChild> val) {
  cef_translator_test_t* _struct = GetStruct();
  if (CEF_MEMBER_MISSING(_struct, set_child_own_ptr_client_and_return_parent))
@@ -1211,8 +1192,9 @@ CefOwnPtr<CefTranslatorTestScopedClient> CefTranslatorTestCToCpp::SetChildOwnPtr

  // Execute
  cef_translator_test_scoped_client_t* _retval =
-      _struct->set_child_own_ptr_client_and_return_parent(_struct,
-      CefTranslatorTestScopedClientChildCppToC::WrapOwn(OWN_PASS(val)));
+      _struct->set_child_own_ptr_client_and_return_parent(
+          _struct,
+          CefTranslatorTestScopedClientChildCppToC::WrapOwn(OWN_PASS(val)));

  // Return type: ownptr_diff
  return CefTranslatorTestScopedClientCppToC::UnwrapOwn(_retval);
@@ -1232,8 +1214,8 @@ int CefTranslatorTestCToCpp::SetRawPtrLibrary(
    return 0;

  // Execute
-  int _retval = _struct->set_raw_ptr_library(_struct,
-      CefTranslatorTestScopedLibraryCToCpp::UnwrapRaw(val));
+  int _retval = _struct->set_raw_ptr_library(
+      _struct, CefTranslatorTestScopedLibraryCToCpp::UnwrapRaw(val));

  // Return type: simple
  return _retval;
@@ -1253,15 +1235,16 @@ int CefTranslatorTestCToCpp::SetChildRawPtrLibrary(
    return 0;

  // Execute
-  int _retval = _struct->set_child_raw_ptr_library(_struct,
-      CefTranslatorTestScopedLibraryChildCToCpp::UnwrapRaw(val));
+  int _retval = _struct->set_child_raw_ptr_library(
+      _struct, CefTranslatorTestScopedLibraryChildCToCpp::UnwrapRaw(val));

  // Return type: simple
  return _retval;
 }

 bool CefTranslatorTestCToCpp::SetRawPtrLibraryList(
-    const std::vector<CefRawPtr<CefTranslatorTestScopedLibrary>>& val, int val1,
+    const std::vector<CefRawPtr<CefTranslatorTestScopedLibrary>>& val,
+    int val1,
    int val2) {
  cef_translator_test_t* _struct = GetStruct();
  if (CEF_MEMBER_MISSING(_struct, set_raw_ptr_library_list))
@@ -1283,18 +1266,15 @@ bool CefTranslatorTestCToCpp::SetRawPtrLibraryList(
  }

  // Execute
-  int _retval = _struct->set_raw_ptr_library_list(_struct,
-      valCount,
-      valList,
-      val1,
-      val2);
+  int _retval =
+      _struct->set_raw_ptr_library_list(_struct, valCount, valList, val1, val2);

  // Restore param:val; type: rawptr_vec_same_byref_const
  if (valList)
-    delete [] valList;
+    delete[] valList;

  // Return type: bool
-  return _retval?true:false;
+  return _retval ? true : false;
 }

 int CefTranslatorTestCToCpp::SetRawPtrClient(
@@ -1315,8 +1295,7 @@ int CefTranslatorTestCToCpp::SetRawPtrClient(
      CefTranslatorTestScopedClientCppToC::WrapRaw(val));

  // Execute
-  int _retval = _struct->set_raw_ptr_client(_struct,
-      valPtr->GetStruct());
+  int _retval = _struct->set_raw_ptr_client(_struct, valPtr->GetStruct());

  // Return type: simple
  return _retval;
@@ -1340,15 +1319,15 @@ int CefTranslatorTestCToCpp::SetChildRawPtrClient(
      CefTranslatorTestScopedClientChildCppToC::WrapRaw(val));

  // Execute
-  int _retval = _struct->set_child_raw_ptr_client(_struct,
-      valPtr->GetStruct());
+  int _retval = _struct->set_child_raw_ptr_client(_struct, valPtr->GetStruct());

  // Return type: simple
  return _retval;
 }

 bool CefTranslatorTestCToCpp::SetRawPtrClientList(
-    const std::vector<CefRawPtr<CefTranslatorTestScopedClient>>& val, int val1,
+    const std::vector<CefRawPtr<CefTranslatorTestScopedClient>>& val,
+    int val1,
    int val2) {
  cef_translator_test_t* _struct = GetStruct();
  if (CEF_MEMBER_MISSING(_struct, set_raw_ptr_client_list))
@@ -1364,18 +1343,16 @@ bool CefTranslatorTestCToCpp::SetRawPtrClientList(
    DCHECK(valList);
    if (valList) {
      for (size_t i = 0; i < valCount; ++i) {
-        valList[i] = CefTranslatorTestScopedClientCppToC::WrapRaw(
-            val[i]).release()->GetStruct();
+        valList[i] = CefTranslatorTestScopedClientCppToC::WrapRaw(val[i])
+                         .release()
+                         ->GetStruct();
      }
    }
  }

  // Execute
-  int _retval = _struct->set_raw_ptr_client_list(_struct,
-      valCount,
-      valList,
-      val1,
-      val2);
+  int _retval =
+      _struct->set_raw_ptr_client_list(_struct, valCount, valList, val1, val2);

  // Restore param:val; type: rawptr_vec_diff_byref_const
  if (valCount > 0) {
@@ -1384,30 +1361,35 @@ bool CefTranslatorTestCToCpp::SetRawPtrClientList(
    }
  }
  if (valList)
-    delete [] valList;
+    delete[] valList;

  // Return type: bool
-  return _retval?true:false;
+  return _retval ? true : false;
 }

-
 // CONSTRUCTOR - Do not edit by hand.

-CefTranslatorTestCToCpp::CefTranslatorTestCToCpp() {
-}
+CefTranslatorTestCToCpp::CefTranslatorTestCToCpp() {}

-template<> cef_translator_test_t* CefCToCppRefCounted<CefTranslatorTestCToCpp,
-    CefTranslatorTest, cef_translator_test_t>::UnwrapDerived(
-    CefWrapperType type, CefTranslatorTest* c) {
+template <>
+cef_translator_test_t* CefCToCppRefCounted<
+    CefTranslatorTestCToCpp,
+    CefTranslatorTest,
+    cef_translator_test_t>::UnwrapDerived(CefWrapperType type,
+                                          CefTranslatorTest* c) {
  NOTREACHED() << "Unexpected class type: " << type;
  return NULL;
 }

 #if DCHECK_IS_ON()
-template<> base::AtomicRefCount CefCToCppRefCounted<CefTranslatorTestCToCpp,
-    CefTranslatorTest, cef_translator_test_t>::DebugObjCt = 0;
+template <>
+base::AtomicRefCount CefCToCppRefCounted<CefTranslatorTestCToCpp,
+                                         CefTranslatorTest,
+                                         cef_translator_test_t>::DebugObjCt = 0;
 #endif

-template<> CefWrapperType CefCToCppRefCounted<CefTranslatorTestCToCpp,
-    CefTranslatorTest, cef_translator_test_t>::kWrapperType =
+template <>
+CefWrapperType CefCToCppRefCounted<CefTranslatorTestCToCpp,
+                                   CefTranslatorTest,
+                                   cef_translator_test_t>::kWrapperType =
    WT_TRANSLATOR_TEST;
--- a/libcef_dll/ctocpp/test/translator_test_ctocpp.h
+++ b/libcef_dll/ctocpp/test/translator_test_ctocpp.h
@@ -9,6 +9,8 @@
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
+// $hash=c86d51db351aeb618d915e3b65d4ee2952884682$
+//

 #ifndef CEF_LIBCEF_DLL_CTOCPP_TEST_TRANSLATOR_TEST_CTOCPP_H_
 #define CEF_LIBCEF_DLL_CTOCPP_TEST_TRANSLATOR_TEST_CTOCPP_H_
@@ -20,15 +22,16 @@

 #include <map>
 #include <vector>
-#include "include/test/cef_translator_test.h"
 #include "include/capi/test/cef_translator_test_capi.h"
+#include "include/test/cef_translator_test.h"
 #include "libcef_dll/ctocpp/ctocpp_ref_counted.h"

 // Wrap a C structure with a C++ class.
 // This class may be instantiated and accessed wrapper-side only.
 class CefTranslatorTestCToCpp
-    : public CefCToCppRefCounted<CefTranslatorTestCToCpp, CefTranslatorTest,
-        cef_translator_test_t> {
+    : public CefCToCppRefCounted<CefTranslatorTestCToCpp,
+                                 CefTranslatorTest,
+                                 cef_translator_test_t> {
 public:
  CefTranslatorTestCToCpp();

@@ -55,8 +58,8 @@ class CefTranslatorTestCToCpp
  bool GetStringListByRef(StringList& val) OVERRIDE;
  bool SetStringMap(const StringMap& val) OVERRIDE;
  bool GetStringMapByRef(std::map<CefString, CefString>& val) OVERRIDE;
-  bool SetStringMultimap(const std::multimap<CefString,
-      CefString>& val) OVERRIDE;
+  bool SetStringMultimap(
+      const std::multimap<CefString, CefString>& val) OVERRIDE;
  bool GetStringMultimapByRef(StringMultimap& val) OVERRIDE;
  CefPoint GetPoint() OVERRIDE;
  bool SetPoint(const CefPoint& val) OVERRIDE;
@@ -70,13 +73,16 @@ class CefTranslatorTestCToCpp
      CefRefPtr<CefTranslatorTestRefPtrLibrary> val) OVERRIDE;
  int SetChildRefPtrLibrary(
      CefRefPtr<CefTranslatorTestRefPtrLibraryChild> val) OVERRIDE;
-  CefRefPtr<CefTranslatorTestRefPtrLibrary> SetChildRefPtrLibraryAndReturnParent(
+  CefRefPtr<CefTranslatorTestRefPtrLibrary>
+  SetChildRefPtrLibraryAndReturnParent(
      CefRefPtr<CefTranslatorTestRefPtrLibraryChild> val) OVERRIDE;
  bool SetRefPtrLibraryList(
      const std::vector<CefRefPtr<CefTranslatorTestRefPtrLibrary>>& val,
-      int val1, int val2) OVERRIDE;
-  bool GetRefPtrLibraryListByRef(RefPtrLibraryList& val, int val1,
+      int val1,
      int val2) OVERRIDE;
+  bool GetRefPtrLibraryListByRef(RefPtrLibraryList& val,
+                                 int val1,
+                                 int val2) OVERRIDE;
  size_t GetRefPtrLibraryListSize() OVERRIDE;
  int SetRefPtrClient(CefRefPtr<CefTranslatorTestRefPtrClient> val) OVERRIDE;
  CefRefPtr<CefTranslatorTestRefPtrClient> SetRefPtrClientAndReturn(
@@ -87,8 +93,10 @@ class CefTranslatorTestCToCpp
      CefRefPtr<CefTranslatorTestRefPtrClientChild> val) OVERRIDE;
  bool SetRefPtrClientList(
      const std::vector<CefRefPtr<CefTranslatorTestRefPtrClient>>& val,
-      int val1, int val2) OVERRIDE;
-  bool GetRefPtrClientListByRef(RefPtrClientList& val,
+      int val1,
+      int val2) OVERRIDE;
+  bool GetRefPtrClientListByRef(
+      RefPtrClientList& val,
      CefRefPtr<CefTranslatorTestRefPtrClient> val1,
      CefRefPtr<CefTranslatorTestRefPtrClient> val2) OVERRIDE;
  size_t GetRefPtrClientListSize() OVERRIDE;
@@ -98,7 +106,8 @@ class CefTranslatorTestCToCpp
      CefOwnPtr<CefTranslatorTestScopedLibrary> val) OVERRIDE;
  int SetChildOwnPtrLibrary(
      CefOwnPtr<CefTranslatorTestScopedLibraryChild> val) OVERRIDE;
-  CefOwnPtr<CefTranslatorTestScopedLibrary> SetChildOwnPtrLibraryAndReturnParent(
+  CefOwnPtr<CefTranslatorTestScopedLibrary>
+  SetChildOwnPtrLibraryAndReturnParent(
      CefOwnPtr<CefTranslatorTestScopedLibraryChild> val) OVERRIDE;
  int SetOwnPtrClient(CefOwnPtr<CefTranslatorTestScopedClient> val) OVERRIDE;
  CefOwnPtr<CefTranslatorTestScopedClient> SetOwnPtrClientAndReturn(
@@ -112,13 +121,15 @@ class CefTranslatorTestCToCpp
      CefRawPtr<CefTranslatorTestScopedLibraryChild> val) OVERRIDE;
  bool SetRawPtrLibraryList(
      const std::vector<CefRawPtr<CefTranslatorTestScopedLibrary>>& val,
-      int val1, int val2) OVERRIDE;
+      int val1,
+      int val2) OVERRIDE;
  int SetRawPtrClient(CefRawPtr<CefTranslatorTestScopedClient> val) OVERRIDE;
  int SetChildRawPtrClient(
      CefRawPtr<CefTranslatorTestScopedClientChild> val) OVERRIDE;
  bool SetRawPtrClientList(
      const std::vector<CefRawPtr<CefTranslatorTestScopedClient>>& val,
-      int val1, int val2) OVERRIDE;
+      int val1,
+      int val2) OVERRIDE;
 };

 #endif  // CEF_LIBCEF_DLL_CTOCPP_TEST_TRANSLATOR_TEST_CTOCPP_H_
--- a/libcef_dll/ctocpp/test/translator_test_ref_ptr_client_child_ctocpp.cc
+++ b/libcef_dll/ctocpp/test/translator_test_ref_ptr_client_child_ctocpp.cc
@@ -9,10 +9,11 @@
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
+// $hash=a8637d9865fe06a6d46a5a8f7c7427e44c52c7a9$
+//

 #include "libcef_dll/ctocpp/test/translator_test_ref_ptr_client_child_ctocpp.h"

-
 // VIRTUAL METHODS - Body may be edited by hand.

 int CefTranslatorTestRefPtrClientChildCToCpp::GetOtherValue() {
@@ -44,28 +45,32 @@ int CefTranslatorTestRefPtrClientChildCToCpp::GetValue() {
  return _retval;
 }

-
 // CONSTRUCTOR - Do not edit by hand.

-CefTranslatorTestRefPtrClientChildCToCpp::CefTranslatorTestRefPtrClientChildCToCpp(
-    ) {
-}
+CefTranslatorTestRefPtrClientChildCToCpp::
+    CefTranslatorTestRefPtrClientChildCToCpp() {}

-template<> cef_translator_test_ref_ptr_client_child_t* CefCToCppRefCounted<CefTranslatorTestRefPtrClientChildCToCpp,
-    CefTranslatorTestRefPtrClientChild,
-    cef_translator_test_ref_ptr_client_child_t>::UnwrapDerived(
-    CefWrapperType type, CefTranslatorTestRefPtrClientChild* c) {
+template <>
+cef_translator_test_ref_ptr_client_child_t*
+CefCToCppRefCounted<CefTranslatorTestRefPtrClientChildCToCpp,
+                    CefTranslatorTestRefPtrClientChild,
+                    cef_translator_test_ref_ptr_client_child_t>::
+    UnwrapDerived(CefWrapperType type, CefTranslatorTestRefPtrClientChild* c) {
  NOTREACHED() << "Unexpected class type: " << type;
  return NULL;
 }

 #if DCHECK_IS_ON()
-template<> base::AtomicRefCount CefCToCppRefCounted<CefTranslatorTestRefPtrClientChildCToCpp,
+template <>
+base::AtomicRefCount CefCToCppRefCounted<
+    CefTranslatorTestRefPtrClientChildCToCpp,
    CefTranslatorTestRefPtrClientChild,
    cef_translator_test_ref_ptr_client_child_t>::DebugObjCt = 0;
 #endif

-template<> CefWrapperType CefCToCppRefCounted<CefTranslatorTestRefPtrClientChildCToCpp,
+template <>
+CefWrapperType CefCToCppRefCounted<
+    CefTranslatorTestRefPtrClientChildCToCpp,
    CefTranslatorTestRefPtrClientChild,
    cef_translator_test_ref_ptr_client_child_t>::kWrapperType =
    WT_TRANSLATOR_TEST_REF_PTR_CLIENT_CHILD;
--- a/libcef_dll/ctocpp/test/translator_test_ref_ptr_client_child_ctocpp.h
+++ b/libcef_dll/ctocpp/test/translator_test_ref_ptr_client_child_ctocpp.h
@@ -9,6 +9,8 @@
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
+// $hash=0d7d73d267052bd84e36b819040da0b40258f551$
+//

 #ifndef CEF_LIBCEF_DLL_CTOCPP_TEST_TRANSLATOR_TEST_REF_PTR_CLIENT_CHILD_CTOCPP_H_
 #define CEF_LIBCEF_DLL_CTOCPP_TEST_TRANSLATOR_TEST_REF_PTR_CLIENT_CHILD_CTOCPP_H_
@@ -18,16 +20,16 @@
 #error This file can be included DLL-side only
 #endif

-#include "include/test/cef_translator_test.h"
 #include "include/capi/test/cef_translator_test_capi.h"
+#include "include/test/cef_translator_test.h"
 #include "libcef_dll/ctocpp/ctocpp_ref_counted.h"

 // Wrap a C structure with a C++ class.
 // This class may be instantiated and accessed DLL-side only.
 class CefTranslatorTestRefPtrClientChildCToCpp
    : public CefCToCppRefCounted<CefTranslatorTestRefPtrClientChildCToCpp,
-        CefTranslatorTestRefPtrClientChild,
-        cef_translator_test_ref_ptr_client_child_t> {
+                                 CefTranslatorTestRefPtrClientChild,
+                                 cef_translator_test_ref_ptr_client_child_t> {
 public:
  CefTranslatorTestRefPtrClientChildCToCpp();

--- a/libcef_dll/ctocpp/test/translator_test_ref_ptr_client_ctocpp.cc
+++ b/libcef_dll/ctocpp/test/translator_test_ref_ptr_client_ctocpp.cc
@@ -9,10 +9,11 @@
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
+// $hash=07881bece2c4f3ec1becec5d12d51d909a122d13$
+//

-#include "libcef_dll/ctocpp/test/translator_test_ref_ptr_client_ctocpp.h"
 #include "libcef_dll/ctocpp/test/translator_test_ref_ptr_client_child_ctocpp.h"
-
+#include "libcef_dll/ctocpp/test/translator_test_ref_ptr_client_ctocpp.h"

 // VIRTUAL METHODS - Body may be edited by hand.

@@ -30,32 +31,36 @@ int CefTranslatorTestRefPtrClientCToCpp::GetValue() {
  return _retval;
 }

-
 // CONSTRUCTOR - Do not edit by hand.

-CefTranslatorTestRefPtrClientCToCpp::CefTranslatorTestRefPtrClientCToCpp() {
-}
+CefTranslatorTestRefPtrClientCToCpp::CefTranslatorTestRefPtrClientCToCpp() {}

-template<> cef_translator_test_ref_ptr_client_t* CefCToCppRefCounted<CefTranslatorTestRefPtrClientCToCpp,
-    CefTranslatorTestRefPtrClient,
-    cef_translator_test_ref_ptr_client_t>::UnwrapDerived(CefWrapperType type,
-    CefTranslatorTestRefPtrClient* c) {
+template <>
+cef_translator_test_ref_ptr_client_t*
+CefCToCppRefCounted<CefTranslatorTestRefPtrClientCToCpp,
+                    CefTranslatorTestRefPtrClient,
+                    cef_translator_test_ref_ptr_client_t>::
+    UnwrapDerived(CefWrapperType type, CefTranslatorTestRefPtrClient* c) {
  if (type == WT_TRANSLATOR_TEST_REF_PTR_CLIENT_CHILD) {
    return reinterpret_cast<cef_translator_test_ref_ptr_client_t*>(
        CefTranslatorTestRefPtrClientChildCToCpp::Unwrap(
-        reinterpret_cast<CefTranslatorTestRefPtrClientChild*>(c)));
+            reinterpret_cast<CefTranslatorTestRefPtrClientChild*>(c)));
  }
  NOTREACHED() << "Unexpected class type: " << type;
  return NULL;
 }

 #if DCHECK_IS_ON()
-template<> base::AtomicRefCount CefCToCppRefCounted<CefTranslatorTestRefPtrClientCToCpp,
-    CefTranslatorTestRefPtrClient,
-    cef_translator_test_ref_ptr_client_t>::DebugObjCt = 0;
+template <>
+base::AtomicRefCount
+    CefCToCppRefCounted<CefTranslatorTestRefPtrClientCToCpp,
+                        CefTranslatorTestRefPtrClient,
+                        cef_translator_test_ref_ptr_client_t>::DebugObjCt = 0;
 #endif

-template<> CefWrapperType CefCToCppRefCounted<CefTranslatorTestRefPtrClientCToCpp,
-    CefTranslatorTestRefPtrClient,
-    cef_translator_test_ref_ptr_client_t>::kWrapperType =
-    WT_TRANSLATOR_TEST_REF_PTR_CLIENT;
+template <>
+CefWrapperType
+    CefCToCppRefCounted<CefTranslatorTestRefPtrClientCToCpp,
+                        CefTranslatorTestRefPtrClient,
+                        cef_translator_test_ref_ptr_client_t>::kWrapperType =
+        WT_TRANSLATOR_TEST_REF_PTR_CLIENT;
--- a/libcef_dll/ctocpp/test/translator_test_ref_ptr_client_ctocpp.h
+++ b/libcef_dll/ctocpp/test/translator_test_ref_ptr_client_ctocpp.h
@@ -9,6 +9,8 @@
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
+// $hash=d07dd78f742011d300473cb926b64a8e6661dbdb$
+//

 #ifndef CEF_LIBCEF_DLL_CTOCPP_TEST_TRANSLATOR_TEST_REF_PTR_CLIENT_CTOCPP_H_
 #define CEF_LIBCEF_DLL_CTOCPP_TEST_TRANSLATOR_TEST_REF_PTR_CLIENT_CTOCPP_H_
@@ -18,15 +20,16 @@
 #error This file can be included DLL-side only
 #endif

-#include "include/test/cef_translator_test.h"
 #include "include/capi/test/cef_translator_test_capi.h"
+#include "include/test/cef_translator_test.h"
 #include "libcef_dll/ctocpp/ctocpp_ref_counted.h"

 // Wrap a C structure with a C++ class.
 // This class may be instantiated and accessed DLL-side only.
 class CefTranslatorTestRefPtrClientCToCpp
    : public CefCToCppRefCounted<CefTranslatorTestRefPtrClientCToCpp,
-        CefTranslatorTestRefPtrClient, cef_translator_test_ref_ptr_client_t> {
+                                 CefTranslatorTestRefPtrClient,
+                                 cef_translator_test_ref_ptr_client_t> {
 public:
  CefTranslatorTestRefPtrClientCToCpp();

--- a/libcef_dll/ctocpp/test/translator_test_ref_ptr_library_child_child_ctocpp.cc
+++ b/libcef_dll/ctocpp/test/translator_test_ref_ptr_library_child_child_ctocpp.cc
@@ -9,28 +9,28 @@
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
+// $hash=a4407d8be20daf15d0f61b04a65d1f43d3de67a1$
+//

 #include "libcef_dll/ctocpp/test/translator_test_ref_ptr_library_child_child_ctocpp.h"

-
 // STATIC METHODS - Body may be edited by hand.

-CefRefPtr<CefTranslatorTestRefPtrLibraryChildChild> CefTranslatorTestRefPtrLibraryChildChild::Create(
-    int value, int other_value, int other_other_value) {
+CefRefPtr<CefTranslatorTestRefPtrLibraryChildChild>
+CefTranslatorTestRefPtrLibraryChildChild::Create(int value,
+                                                 int other_value,
+                                                 int other_other_value) {
  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING

  // Execute
  cef_translator_test_ref_ptr_library_child_child_t* _retval =
-      cef_translator_test_ref_ptr_library_child_child_create(
-      value,
-      other_value,
-      other_other_value);
+      cef_translator_test_ref_ptr_library_child_child_create(value, other_value,
+                                                             other_other_value);

  // Return type: refptr_same
  return CefTranslatorTestRefPtrLibraryChildChildCToCpp::Wrap(_retval);
 }

-
 // VIRTUAL METHODS - Body may be edited by hand.

 int CefTranslatorTestRefPtrLibraryChildChildCToCpp::GetOtherOtherValue() {
@@ -56,14 +56,13 @@ void CefTranslatorTestRefPtrLibraryChildChildCToCpp::SetOtherOtherValue(
  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING

  // Execute
-  _struct->set_other_other_value(_struct,
-      value);
+  _struct->set_other_other_value(_struct, value);
 }

 int CefTranslatorTestRefPtrLibraryChildChildCToCpp::GetOtherValue() {
  cef_translator_test_ref_ptr_library_child_t* _struct =
-      reinterpret_cast<cef_translator_test_ref_ptr_library_child_t*>(GetStruct(
-      ));
+      reinterpret_cast<cef_translator_test_ref_ptr_library_child_t*>(
+          GetStruct());
  if (CEF_MEMBER_MISSING(_struct, get_other_value))
    return 0;

@@ -78,16 +77,15 @@ int CefTranslatorTestRefPtrLibraryChildChildCToCpp::GetOtherValue() {

 void CefTranslatorTestRefPtrLibraryChildChildCToCpp::SetOtherValue(int value) {
  cef_translator_test_ref_ptr_library_child_t* _struct =
-      reinterpret_cast<cef_translator_test_ref_ptr_library_child_t*>(GetStruct(
-      ));
+      reinterpret_cast<cef_translator_test_ref_ptr_library_child_t*>(
+          GetStruct());
  if (CEF_MEMBER_MISSING(_struct, set_other_value))
    return;

  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING

  // Execute
-  _struct->set_other_value(_struct,
-      value);
+  _struct->set_other_value(_struct, value);
 }

 int CefTranslatorTestRefPtrLibraryChildChildCToCpp::GetValue() {
@@ -114,32 +112,36 @@ void CefTranslatorTestRefPtrLibraryChildChildCToCpp::SetValue(int value) {
  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING

  // Execute
-  _struct->set_value(_struct,
-      value);
+  _struct->set_value(_struct, value);
 }

-
 // CONSTRUCTOR - Do not edit by hand.

-CefTranslatorTestRefPtrLibraryChildChildCToCpp::CefTranslatorTestRefPtrLibraryChildChildCToCpp(
-    ) {
-}
+CefTranslatorTestRefPtrLibraryChildChildCToCpp::
+    CefTranslatorTestRefPtrLibraryChildChildCToCpp() {}

-template<> cef_translator_test_ref_ptr_library_child_child_t* CefCToCppRefCounted<CefTranslatorTestRefPtrLibraryChildChildCToCpp,
-    CefTranslatorTestRefPtrLibraryChildChild,
-    cef_translator_test_ref_ptr_library_child_child_t>::UnwrapDerived(
-    CefWrapperType type, CefTranslatorTestRefPtrLibraryChildChild* c) {
+template <>
+cef_translator_test_ref_ptr_library_child_child_t*
+CefCToCppRefCounted<CefTranslatorTestRefPtrLibraryChildChildCToCpp,
+                    CefTranslatorTestRefPtrLibraryChildChild,
+                    cef_translator_test_ref_ptr_library_child_child_t>::
+    UnwrapDerived(CefWrapperType type,
+                  CefTranslatorTestRefPtrLibraryChildChild* c) {
  NOTREACHED() << "Unexpected class type: " << type;
  return NULL;
 }

 #if DCHECK_IS_ON()
-template<> base::AtomicRefCount CefCToCppRefCounted<CefTranslatorTestRefPtrLibraryChildChildCToCpp,
+template <>
+base::AtomicRefCount CefCToCppRefCounted<
+    CefTranslatorTestRefPtrLibraryChildChildCToCpp,
    CefTranslatorTestRefPtrLibraryChildChild,
    cef_translator_test_ref_ptr_library_child_child_t>::DebugObjCt = 0;
 #endif

-template<> CefWrapperType CefCToCppRefCounted<CefTranslatorTestRefPtrLibraryChildChildCToCpp,
+template <>
+CefWrapperType CefCToCppRefCounted<
+    CefTranslatorTestRefPtrLibraryChildChildCToCpp,
    CefTranslatorTestRefPtrLibraryChildChild,
    cef_translator_test_ref_ptr_library_child_child_t>::kWrapperType =
    WT_TRANSLATOR_TEST_REF_PTR_LIBRARY_CHILD_CHILD;
--- a/libcef_dll/ctocpp/test/translator_test_ref_ptr_library_child_child_ctocpp.h
+++ b/libcef_dll/ctocpp/test/translator_test_ref_ptr_library_child_child_ctocpp.h
@@ -9,6 +9,8 @@
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
+// $hash=a78c19f40ad8ff5fd10bdaeba1675753ca1389e7$
+//

 #ifndef CEF_LIBCEF_DLL_CTOCPP_TEST_TRANSLATOR_TEST_REF_PTR_LIBRARY_CHILD_CHILD_CTOCPP_H_
 #define CEF_LIBCEF_DLL_CTOCPP_TEST_TRANSLATOR_TEST_REF_PTR_LIBRARY_CHILD_CHILD_CTOCPP_H_
@@ -18,16 +20,17 @@
 #error This file can be included wrapper-side only
 #endif

-#include "include/test/cef_translator_test.h"
 #include "include/capi/test/cef_translator_test_capi.h"
+#include "include/test/cef_translator_test.h"
 #include "libcef_dll/ctocpp/ctocpp_ref_counted.h"

 // Wrap a C structure with a C++ class.
 // This class may be instantiated and accessed wrapper-side only.
 class CefTranslatorTestRefPtrLibraryChildChildCToCpp
-    : public CefCToCppRefCounted<CefTranslatorTestRefPtrLibraryChildChildCToCpp,
-        CefTranslatorTestRefPtrLibraryChildChild,
-        cef_translator_test_ref_ptr_library_child_child_t> {
+    : public CefCToCppRefCounted<
+          CefTranslatorTestRefPtrLibraryChildChildCToCpp,
+          CefTranslatorTestRefPtrLibraryChildChild,
+          cef_translator_test_ref_ptr_library_child_child_t> {
 public:
  CefTranslatorTestRefPtrLibraryChildChildCToCpp();

--- a/libcef_dll/ctocpp/test/translator_test_ref_ptr_library_child_ctocpp.cc
+++ b/libcef_dll/ctocpp/test/translator_test_ref_ptr_library_child_ctocpp.cc
@@ -9,28 +9,26 @@
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
+// $hash=42b33c187c2a011f627f10b314bf89363101aa4e$
+//

-#include "libcef_dll/ctocpp/test/translator_test_ref_ptr_library_child_ctocpp.h"
 #include "libcef_dll/ctocpp/test/translator_test_ref_ptr_library_child_child_ctocpp.h"
-
+#include "libcef_dll/ctocpp/test/translator_test_ref_ptr_library_child_ctocpp.h"

 // STATIC METHODS - Body may be edited by hand.

-CefRefPtr<CefTranslatorTestRefPtrLibraryChild> CefTranslatorTestRefPtrLibraryChild::Create(
-    int value, int other_value) {
+CefRefPtr<CefTranslatorTestRefPtrLibraryChild>
+CefTranslatorTestRefPtrLibraryChild::Create(int value, int other_value) {
  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING

  // Execute
  cef_translator_test_ref_ptr_library_child_t* _retval =
-      cef_translator_test_ref_ptr_library_child_create(
-      value,
-      other_value);
+      cef_translator_test_ref_ptr_library_child_create(value, other_value);

  // Return type: refptr_same
  return CefTranslatorTestRefPtrLibraryChildCToCpp::Wrap(_retval);
 }

-
 // VIRTUAL METHODS - Body may be edited by hand.

 int CefTranslatorTestRefPtrLibraryChildCToCpp::GetOtherValue() {
@@ -55,8 +53,7 @@ void CefTranslatorTestRefPtrLibraryChildCToCpp::SetOtherValue(int value) {
  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING

  // Execute
-  _struct->set_other_value(_struct,
-      value);
+  _struct->set_other_value(_struct, value);
 }

 int CefTranslatorTestRefPtrLibraryChildCToCpp::GetValue() {
@@ -83,37 +80,40 @@ void CefTranslatorTestRefPtrLibraryChildCToCpp::SetValue(int value) {
  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING

  // Execute
-  _struct->set_value(_struct,
-      value);
+  _struct->set_value(_struct, value);
 }

-
 // CONSTRUCTOR - Do not edit by hand.

-CefTranslatorTestRefPtrLibraryChildCToCpp::CefTranslatorTestRefPtrLibraryChildCToCpp(
-    ) {
-}
+CefTranslatorTestRefPtrLibraryChildCToCpp::
+    CefTranslatorTestRefPtrLibraryChildCToCpp() {}

-template<> cef_translator_test_ref_ptr_library_child_t* CefCToCppRefCounted<CefTranslatorTestRefPtrLibraryChildCToCpp,
-    CefTranslatorTestRefPtrLibraryChild,
-    cef_translator_test_ref_ptr_library_child_t>::UnwrapDerived(
-    CefWrapperType type, CefTranslatorTestRefPtrLibraryChild* c) {
+template <>
+cef_translator_test_ref_ptr_library_child_t*
+CefCToCppRefCounted<CefTranslatorTestRefPtrLibraryChildCToCpp,
+                    CefTranslatorTestRefPtrLibraryChild,
+                    cef_translator_test_ref_ptr_library_child_t>::
+    UnwrapDerived(CefWrapperType type, CefTranslatorTestRefPtrLibraryChild* c) {
  if (type == WT_TRANSLATOR_TEST_REF_PTR_LIBRARY_CHILD_CHILD) {
    return reinterpret_cast<cef_translator_test_ref_ptr_library_child_t*>(
        CefTranslatorTestRefPtrLibraryChildChildCToCpp::Unwrap(
-        reinterpret_cast<CefTranslatorTestRefPtrLibraryChildChild*>(c)));
+            reinterpret_cast<CefTranslatorTestRefPtrLibraryChildChild*>(c)));
  }
  NOTREACHED() << "Unexpected class type: " << type;
  return NULL;
 }

 #if DCHECK_IS_ON()
-template<> base::AtomicRefCount CefCToCppRefCounted<CefTranslatorTestRefPtrLibraryChildCToCpp,
+template <>
+base::AtomicRefCount CefCToCppRefCounted<
+    CefTranslatorTestRefPtrLibraryChildCToCpp,
    CefTranslatorTestRefPtrLibraryChild,
    cef_translator_test_ref_ptr_library_child_t>::DebugObjCt = 0;
 #endif

-template<> CefWrapperType CefCToCppRefCounted<CefTranslatorTestRefPtrLibraryChildCToCpp,
+template <>
+CefWrapperType CefCToCppRefCounted<
+    CefTranslatorTestRefPtrLibraryChildCToCpp,
    CefTranslatorTestRefPtrLibraryChild,
    cef_translator_test_ref_ptr_library_child_t>::kWrapperType =
    WT_TRANSLATOR_TEST_REF_PTR_LIBRARY_CHILD;
--- a/libcef_dll/ctocpp/test/translator_test_ref_ptr_library_child_ctocpp.h
+++ b/libcef_dll/ctocpp/test/translator_test_ref_ptr_library_child_ctocpp.h
@@ -9,6 +9,8 @@
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
+// $hash=4e4d079f92bba5864128b9310e2085f82e70bf4e$
+//

 #ifndef CEF_LIBCEF_DLL_CTOCPP_TEST_TRANSLATOR_TEST_REF_PTR_LIBRARY_CHILD_CTOCPP_H_
 #define CEF_LIBCEF_DLL_CTOCPP_TEST_TRANSLATOR_TEST_REF_PTR_LIBRARY_CHILD_CTOCPP_H_
@@ -18,16 +20,16 @@
 #error This file can be included wrapper-side only
 #endif

-#include "include/test/cef_translator_test.h"
 #include "include/capi/test/cef_translator_test_capi.h"
+#include "include/test/cef_translator_test.h"
 #include "libcef_dll/ctocpp/ctocpp_ref_counted.h"

 // Wrap a C structure with a C++ class.
 // This class may be instantiated and accessed wrapper-side only.
 class CefTranslatorTestRefPtrLibraryChildCToCpp
    : public CefCToCppRefCounted<CefTranslatorTestRefPtrLibraryChildCToCpp,
-        CefTranslatorTestRefPtrLibraryChild,
-        cef_translator_test_ref_ptr_library_child_t> {
+                                 CefTranslatorTestRefPtrLibraryChild,
+                                 cef_translator_test_ref_ptr_library_child_t> {
 public:
  CefTranslatorTestRefPtrLibraryChildCToCpp();

--- a/libcef_dll/ctocpp/test/translator_test_ref_ptr_library_ctocpp.cc
+++ b/libcef_dll/ctocpp/test/translator_test_ref_ptr_library_ctocpp.cc
@@ -9,28 +9,27 @@
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
+// $hash=8378563b430352b25a0ae9400c3c181798dec565$
+//

-#include "libcef_dll/ctocpp/test/translator_test_ref_ptr_library_ctocpp.h"
-#include "libcef_dll/ctocpp/test/translator_test_ref_ptr_library_child_ctocpp.h"
 #include "libcef_dll/ctocpp/test/translator_test_ref_ptr_library_child_child_ctocpp.h"
-
+#include "libcef_dll/ctocpp/test/translator_test_ref_ptr_library_child_ctocpp.h"
+#include "libcef_dll/ctocpp/test/translator_test_ref_ptr_library_ctocpp.h"

 // STATIC METHODS - Body may be edited by hand.

-CefRefPtr<CefTranslatorTestRefPtrLibrary> CefTranslatorTestRefPtrLibrary::Create(
-    int value) {
+CefRefPtr<CefTranslatorTestRefPtrLibrary>
+CefTranslatorTestRefPtrLibrary::Create(int value) {
  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING

  // Execute
  cef_translator_test_ref_ptr_library_t* _retval =
-      cef_translator_test_ref_ptr_library_create(
-      value);
+      cef_translator_test_ref_ptr_library_create(value);

  // Return type: refptr_same
  return CefTranslatorTestRefPtrLibraryCToCpp::Wrap(_retval);
 }

-
 // VIRTUAL METHODS - Body may be edited by hand.

 int CefTranslatorTestRefPtrLibraryCToCpp::GetValue() {
@@ -55,41 +54,44 @@ void CefTranslatorTestRefPtrLibraryCToCpp::SetValue(int value) {
  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING

  // Execute
-  _struct->set_value(_struct,
-      value);
+  _struct->set_value(_struct, value);
 }

-
 // CONSTRUCTOR - Do not edit by hand.

-CefTranslatorTestRefPtrLibraryCToCpp::CefTranslatorTestRefPtrLibraryCToCpp() {
-}
+CefTranslatorTestRefPtrLibraryCToCpp::CefTranslatorTestRefPtrLibraryCToCpp() {}

-template<> cef_translator_test_ref_ptr_library_t* CefCToCppRefCounted<CefTranslatorTestRefPtrLibraryCToCpp,
-    CefTranslatorTestRefPtrLibrary,
-    cef_translator_test_ref_ptr_library_t>::UnwrapDerived(CefWrapperType type,
-    CefTranslatorTestRefPtrLibrary* c) {
+template <>
+cef_translator_test_ref_ptr_library_t*
+CefCToCppRefCounted<CefTranslatorTestRefPtrLibraryCToCpp,
+                    CefTranslatorTestRefPtrLibrary,
+                    cef_translator_test_ref_ptr_library_t>::
+    UnwrapDerived(CefWrapperType type, CefTranslatorTestRefPtrLibrary* c) {
  if (type == WT_TRANSLATOR_TEST_REF_PTR_LIBRARY_CHILD) {
    return reinterpret_cast<cef_translator_test_ref_ptr_library_t*>(
        CefTranslatorTestRefPtrLibraryChildCToCpp::Unwrap(
-        reinterpret_cast<CefTranslatorTestRefPtrLibraryChild*>(c)));
+            reinterpret_cast<CefTranslatorTestRefPtrLibraryChild*>(c)));
  }
  if (type == WT_TRANSLATOR_TEST_REF_PTR_LIBRARY_CHILD_CHILD) {
    return reinterpret_cast<cef_translator_test_ref_ptr_library_t*>(
        CefTranslatorTestRefPtrLibraryChildChildCToCpp::Unwrap(
-        reinterpret_cast<CefTranslatorTestRefPtrLibraryChildChild*>(c)));
+            reinterpret_cast<CefTranslatorTestRefPtrLibraryChildChild*>(c)));
  }
  NOTREACHED() << "Unexpected class type: " << type;
  return NULL;
 }

 #if DCHECK_IS_ON()
-template<> base::AtomicRefCount CefCToCppRefCounted<CefTranslatorTestRefPtrLibraryCToCpp,
-    CefTranslatorTestRefPtrLibrary,
-    cef_translator_test_ref_ptr_library_t>::DebugObjCt = 0;
+template <>
+base::AtomicRefCount
+    CefCToCppRefCounted<CefTranslatorTestRefPtrLibraryCToCpp,
+                        CefTranslatorTestRefPtrLibrary,
+                        cef_translator_test_ref_ptr_library_t>::DebugObjCt = 0;
 #endif

-template<> CefWrapperType CefCToCppRefCounted<CefTranslatorTestRefPtrLibraryCToCpp,
-    CefTranslatorTestRefPtrLibrary,
-    cef_translator_test_ref_ptr_library_t>::kWrapperType =
-    WT_TRANSLATOR_TEST_REF_PTR_LIBRARY;
+template <>
+CefWrapperType
+    CefCToCppRefCounted<CefTranslatorTestRefPtrLibraryCToCpp,
+                        CefTranslatorTestRefPtrLibrary,
+                        cef_translator_test_ref_ptr_library_t>::kWrapperType =
+        WT_TRANSLATOR_TEST_REF_PTR_LIBRARY;
--- a/libcef_dll/ctocpp/test/translator_test_ref_ptr_library_ctocpp.h
+++ b/libcef_dll/ctocpp/test/translator_test_ref_ptr_library_ctocpp.h
@@ -9,6 +9,8 @@
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
+// $hash=0b3741e17039b85b3fda09f552304b911c5905b1$
+//

 #ifndef CEF_LIBCEF_DLL_CTOCPP_TEST_TRANSLATOR_TEST_REF_PTR_LIBRARY_CTOCPP_H_
 #define CEF_LIBCEF_DLL_CTOCPP_TEST_TRANSLATOR_TEST_REF_PTR_LIBRARY_CTOCPP_H_
@@ -18,16 +20,16 @@
 #error This file can be included wrapper-side only
 #endif

-#include "include/test/cef_translator_test.h"
 #include "include/capi/test/cef_translator_test_capi.h"
+#include "include/test/cef_translator_test.h"
 #include "libcef_dll/ctocpp/ctocpp_ref_counted.h"

 // Wrap a C structure with a C++ class.
 // This class may be instantiated and accessed wrapper-side only.
 class CefTranslatorTestRefPtrLibraryCToCpp
    : public CefCToCppRefCounted<CefTranslatorTestRefPtrLibraryCToCpp,
-        CefTranslatorTestRefPtrLibrary,
-        cef_translator_test_ref_ptr_library_t> {
+                                 CefTranslatorTestRefPtrLibrary,
+                                 cef_translator_test_ref_ptr_library_t> {
 public:
  CefTranslatorTestRefPtrLibraryCToCpp();

--- a/libcef_dll/ctocpp/test/translator_test_scoped_client_child_ctocpp.cc
+++ b/libcef_dll/ctocpp/test/translator_test_scoped_client_child_ctocpp.cc
@@ -9,10 +9,11 @@
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
+// $hash=039072ac0b2371a43277b274d6701b32143cfcf2$
+//

 #include "libcef_dll/ctocpp/test/translator_test_scoped_client_child_ctocpp.h"

-
 // VIRTUAL METHODS - Body may be edited by hand.

 int CefTranslatorTestScopedClientChildCToCpp::GetOtherValue() {
@@ -44,36 +45,44 @@ int CefTranslatorTestScopedClientChildCToCpp::GetValue() {
  return _retval;
 }

-
 // CONSTRUCTOR - Do not edit by hand.

-CefTranslatorTestScopedClientChildCToCpp::CefTranslatorTestScopedClientChildCToCpp(
-    ) {
-}
+CefTranslatorTestScopedClientChildCToCpp::
+    CefTranslatorTestScopedClientChildCToCpp() {}

-template<> cef_translator_test_scoped_client_child_t* CefCToCppScoped<CefTranslatorTestScopedClientChildCToCpp,
-    CefTranslatorTestScopedClientChild,
-    cef_translator_test_scoped_client_child_t>::UnwrapDerivedOwn(
-    CefWrapperType type, CefOwnPtr<CefTranslatorTestScopedClientChild> c) {
+template <>
+cef_translator_test_scoped_client_child_t*
+CefCToCppScoped<CefTranslatorTestScopedClientChildCToCpp,
+                CefTranslatorTestScopedClientChild,
+                cef_translator_test_scoped_client_child_t>::
+    UnwrapDerivedOwn(CefWrapperType type,
+                     CefOwnPtr<CefTranslatorTestScopedClientChild> c) {
  NOTREACHED() << "Unexpected class type: " << type;
  return NULL;
 }

-template<> cef_translator_test_scoped_client_child_t* CefCToCppScoped<CefTranslatorTestScopedClientChildCToCpp,
-    CefTranslatorTestScopedClientChild,
-    cef_translator_test_scoped_client_child_t>::UnwrapDerivedRaw(
-    CefWrapperType type, CefRawPtr<CefTranslatorTestScopedClientChild> c) {
+template <>
+cef_translator_test_scoped_client_child_t*
+CefCToCppScoped<CefTranslatorTestScopedClientChildCToCpp,
+                CefTranslatorTestScopedClientChild,
+                cef_translator_test_scoped_client_child_t>::
+    UnwrapDerivedRaw(CefWrapperType type,
+                     CefRawPtr<CefTranslatorTestScopedClientChild> c) {
  NOTREACHED() << "Unexpected class type: " << type;
  return NULL;
 }

 #if DCHECK_IS_ON()
-template<> base::AtomicRefCount CefCToCppScoped<CefTranslatorTestScopedClientChildCToCpp,
-    CefTranslatorTestScopedClientChild,
-    cef_translator_test_scoped_client_child_t>::DebugObjCt = 0;
+template <>
+base::AtomicRefCount
+    CefCToCppScoped<CefTranslatorTestScopedClientChildCToCpp,
+                    CefTranslatorTestScopedClientChild,
+                    cef_translator_test_scoped_client_child_t>::DebugObjCt = 0;
 #endif

-template<> CefWrapperType CefCToCppScoped<CefTranslatorTestScopedClientChildCToCpp,
-    CefTranslatorTestScopedClientChild,
-    cef_translator_test_scoped_client_child_t>::kWrapperType =
-    WT_TRANSLATOR_TEST_SCOPED_CLIENT_CHILD;
+template <>
+CefWrapperType
+    CefCToCppScoped<CefTranslatorTestScopedClientChildCToCpp,
+                    CefTranslatorTestScopedClientChild,
+                    cef_translator_test_scoped_client_child_t>::kWrapperType =
+        WT_TRANSLATOR_TEST_SCOPED_CLIENT_CHILD;
--- a/libcef_dll/ctocpp/test/translator_test_scoped_client_child_ctocpp.h
+++ b/libcef_dll/ctocpp/test/translator_test_scoped_client_child_ctocpp.h
@@ -9,6 +9,8 @@
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
+// $hash=8d312aa7be71578d576d6a698ecc351382f5bdf2$
+//

 #ifndef CEF_LIBCEF_DLL_CTOCPP_TEST_TRANSLATOR_TEST_SCOPED_CLIENT_CHILD_CTOCPP_H_
 #define CEF_LIBCEF_DLL_CTOCPP_TEST_TRANSLATOR_TEST_SCOPED_CLIENT_CHILD_CTOCPP_H_
@@ -18,16 +20,16 @@
 #error This file can be included DLL-side only
 #endif

-#include "include/test/cef_translator_test.h"
 #include "include/capi/test/cef_translator_test_capi.h"
+#include "include/test/cef_translator_test.h"
 #include "libcef_dll/ctocpp/ctocpp_scoped.h"

 // Wrap a C structure with a C++ class.
 // This class may be instantiated and accessed DLL-side only.
 class CefTranslatorTestScopedClientChildCToCpp
    : public CefCToCppScoped<CefTranslatorTestScopedClientChildCToCpp,
-        CefTranslatorTestScopedClientChild,
-        cef_translator_test_scoped_client_child_t> {
+                             CefTranslatorTestScopedClientChild,
+                             cef_translator_test_scoped_client_child_t> {
 public:
  CefTranslatorTestScopedClientChildCToCpp();

--- a/libcef_dll/ctocpp/test/translator_test_scoped_client_ctocpp.cc
+++ b/libcef_dll/ctocpp/test/translator_test_scoped_client_ctocpp.cc
@@ -9,10 +9,11 @@
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
+// $hash=8695b6dab7c2fe666f99f1229549b89f50301301$
+//

-#include "libcef_dll/ctocpp/test/translator_test_scoped_client_ctocpp.h"
 #include "libcef_dll/ctocpp/test/translator_test_scoped_client_child_ctocpp.h"
-
+#include "libcef_dll/ctocpp/test/translator_test_scoped_client_ctocpp.h"

 // VIRTUAL METHODS - Body may be edited by hand.

@@ -30,48 +31,57 @@ int CefTranslatorTestScopedClientCToCpp::GetValue() {
  return _retval;
 }

-
 // CONSTRUCTOR - Do not edit by hand.

-CefTranslatorTestScopedClientCToCpp::CefTranslatorTestScopedClientCToCpp() {
-}
+CefTranslatorTestScopedClientCToCpp::CefTranslatorTestScopedClientCToCpp() {}

-template<> cef_translator_test_scoped_client_t* CefCToCppScoped<CefTranslatorTestScopedClientCToCpp,
-    CefTranslatorTestScopedClient,
-    cef_translator_test_scoped_client_t>::UnwrapDerivedOwn(CefWrapperType type,
-    CefOwnPtr<CefTranslatorTestScopedClient> c) {
+template <>
+cef_translator_test_scoped_client_t*
+CefCToCppScoped<CefTranslatorTestScopedClientCToCpp,
+                CefTranslatorTestScopedClient,
+                cef_translator_test_scoped_client_t>::
+    UnwrapDerivedOwn(CefWrapperType type,
+                     CefOwnPtr<CefTranslatorTestScopedClient> c) {
  if (type == WT_TRANSLATOR_TEST_SCOPED_CLIENT_CHILD) {
    return reinterpret_cast<cef_translator_test_scoped_client_t*>(
        CefTranslatorTestScopedClientChildCToCpp::UnwrapOwn(
-        CefOwnPtr<CefTranslatorTestScopedClientChild>(
-        reinterpret_cast<CefTranslatorTestScopedClientChild*>(c.release()))));
+            CefOwnPtr<CefTranslatorTestScopedClientChild>(
+                reinterpret_cast<CefTranslatorTestScopedClientChild*>(
+                    c.release()))));
  }
  NOTREACHED() << "Unexpected class type: " << type;
  return NULL;
 }

-template<> cef_translator_test_scoped_client_t* CefCToCppScoped<CefTranslatorTestScopedClientCToCpp,
-    CefTranslatorTestScopedClient,
-    cef_translator_test_scoped_client_t>::UnwrapDerivedRaw(CefWrapperType type,
-    CefRawPtr<CefTranslatorTestScopedClient> c) {
+template <>
+cef_translator_test_scoped_client_t*
+CefCToCppScoped<CefTranslatorTestScopedClientCToCpp,
+                CefTranslatorTestScopedClient,
+                cef_translator_test_scoped_client_t>::
+    UnwrapDerivedRaw(CefWrapperType type,
+                     CefRawPtr<CefTranslatorTestScopedClient> c) {
  if (type == WT_TRANSLATOR_TEST_SCOPED_CLIENT_CHILD) {
    return reinterpret_cast<cef_translator_test_scoped_client_t*>(
        CefTranslatorTestScopedClientChildCToCpp::UnwrapRaw(
-        CefRawPtr<CefTranslatorTestScopedClientChild>(
-        reinterpret_cast<CefTranslatorTestScopedClientChild*>(CEF_RAW_PTR_GET(
-        c)))));
+            CefRawPtr<CefTranslatorTestScopedClientChild>(
+                reinterpret_cast<CefTranslatorTestScopedClientChild*>(
+                    CEF_RAW_PTR_GET(c)))));
  }
  NOTREACHED() << "Unexpected class type: " << type;
  return NULL;
 }

 #if DCHECK_IS_ON()
-template<> base::AtomicRefCount CefCToCppScoped<CefTranslatorTestScopedClientCToCpp,
-    CefTranslatorTestScopedClient,
-    cef_translator_test_scoped_client_t>::DebugObjCt = 0;
+template <>
+base::AtomicRefCount
+    CefCToCppScoped<CefTranslatorTestScopedClientCToCpp,
+                    CefTranslatorTestScopedClient,
+                    cef_translator_test_scoped_client_t>::DebugObjCt = 0;
 #endif

-template<> CefWrapperType CefCToCppScoped<CefTranslatorTestScopedClientCToCpp,
-    CefTranslatorTestScopedClient,
-    cef_translator_test_scoped_client_t>::kWrapperType =
-    WT_TRANSLATOR_TEST_SCOPED_CLIENT;
+template <>
+CefWrapperType
+    CefCToCppScoped<CefTranslatorTestScopedClientCToCpp,
+                    CefTranslatorTestScopedClient,
+                    cef_translator_test_scoped_client_t>::kWrapperType =
+        WT_TRANSLATOR_TEST_SCOPED_CLIENT;
--- a/libcef_dll/ctocpp/test/translator_test_scoped_client_ctocpp.h
+++ b/libcef_dll/ctocpp/test/translator_test_scoped_client_ctocpp.h
@@ -9,6 +9,8 @@
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
+// $hash=d4c5506ce6facfc859087098e8ec17694a5cfa52$
+//

 #ifndef CEF_LIBCEF_DLL_CTOCPP_TEST_TRANSLATOR_TEST_SCOPED_CLIENT_CTOCPP_H_
 #define CEF_LIBCEF_DLL_CTOCPP_TEST_TRANSLATOR_TEST_SCOPED_CLIENT_CTOCPP_H_
@@ -18,15 +20,16 @@
 #error This file can be included DLL-side only
 #endif

-#include "include/test/cef_translator_test.h"
 #include "include/capi/test/cef_translator_test_capi.h"
+#include "include/test/cef_translator_test.h"
 #include "libcef_dll/ctocpp/ctocpp_scoped.h"

 // Wrap a C structure with a C++ class.
 // This class may be instantiated and accessed DLL-side only.
 class CefTranslatorTestScopedClientCToCpp
    : public CefCToCppScoped<CefTranslatorTestScopedClientCToCpp,
-        CefTranslatorTestScopedClient, cef_translator_test_scoped_client_t> {
+                             CefTranslatorTestScopedClient,
+                             cef_translator_test_scoped_client_t> {
 public:
  CefTranslatorTestScopedClientCToCpp();

--- a/libcef_dll/ctocpp/test/translator_test_scoped_library_child_child_ctocpp.cc
+++ b/libcef_dll/ctocpp/test/translator_test_scoped_library_child_child_ctocpp.cc
@@ -9,28 +9,28 @@
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
+// $hash=65f1a184cabfaeb24fe9ef8ae1ca0581eddab410$
+//

 #include "libcef_dll/ctocpp/test/translator_test_scoped_library_child_child_ctocpp.h"

-
 // STATIC METHODS - Body may be edited by hand.

-CefOwnPtr<CefTranslatorTestScopedLibraryChildChild> CefTranslatorTestScopedLibraryChildChild::Create(
-    int value, int other_value, int other_other_value) {
+CefOwnPtr<CefTranslatorTestScopedLibraryChildChild>
+CefTranslatorTestScopedLibraryChildChild::Create(int value,
+                                                 int other_value,
+                                                 int other_other_value) {
  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING

  // Execute
  cef_translator_test_scoped_library_child_child_t* _retval =
-      cef_translator_test_scoped_library_child_child_create(
-      value,
-      other_value,
-      other_other_value);
+      cef_translator_test_scoped_library_child_child_create(value, other_value,
+                                                            other_other_value);

  // Return type: ownptr_same
  return CefTranslatorTestScopedLibraryChildChildCToCpp::Wrap(_retval);
 }

-
 // VIRTUAL METHODS - Body may be edited by hand.

 int CefTranslatorTestScopedLibraryChildChildCToCpp::GetOtherOtherValue() {
@@ -56,14 +56,13 @@ void CefTranslatorTestScopedLibraryChildChildCToCpp::SetOtherOtherValue(
  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING

  // Execute
-  _struct->set_other_other_value(_struct,
-      value);
+  _struct->set_other_other_value(_struct, value);
 }

 int CefTranslatorTestScopedLibraryChildChildCToCpp::GetOtherValue() {
  cef_translator_test_scoped_library_child_t* _struct =
-      reinterpret_cast<cef_translator_test_scoped_library_child_t*>(GetStruct(
-      ));
+      reinterpret_cast<cef_translator_test_scoped_library_child_t*>(
+          GetStruct());
  if (CEF_MEMBER_MISSING(_struct, get_other_value))
    return 0;

@@ -78,16 +77,15 @@ int CefTranslatorTestScopedLibraryChildChildCToCpp::GetOtherValue() {

 void CefTranslatorTestScopedLibraryChildChildCToCpp::SetOtherValue(int value) {
  cef_translator_test_scoped_library_child_t* _struct =
-      reinterpret_cast<cef_translator_test_scoped_library_child_t*>(GetStruct(
-      ));
+      reinterpret_cast<cef_translator_test_scoped_library_child_t*>(
+          GetStruct());
  if (CEF_MEMBER_MISSING(_struct, set_other_value))
    return;

  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING

  // Execute
-  _struct->set_other_value(_struct,
-      value);
+  _struct->set_other_value(_struct, value);
 }

 int CefTranslatorTestScopedLibraryChildChildCToCpp::GetValue() {
@@ -114,42 +112,47 @@ void CefTranslatorTestScopedLibraryChildChildCToCpp::SetValue(int value) {
  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING

  // Execute
-  _struct->set_value(_struct,
-      value);
+  _struct->set_value(_struct, value);
 }

-
 // CONSTRUCTOR - Do not edit by hand.

-CefTranslatorTestScopedLibraryChildChildCToCpp::CefTranslatorTestScopedLibraryChildChildCToCpp(
-    ) {
-}
+CefTranslatorTestScopedLibraryChildChildCToCpp::
+    CefTranslatorTestScopedLibraryChildChildCToCpp() {}

-template<> cef_translator_test_scoped_library_child_child_t* CefCToCppScoped<CefTranslatorTestScopedLibraryChildChildCToCpp,
-    CefTranslatorTestScopedLibraryChildChild,
-    cef_translator_test_scoped_library_child_child_t>::UnwrapDerivedOwn(
-    CefWrapperType type,
-    CefOwnPtr<CefTranslatorTestScopedLibraryChildChild> c) {
+template <>
+cef_translator_test_scoped_library_child_child_t*
+CefCToCppScoped<CefTranslatorTestScopedLibraryChildChildCToCpp,
+                CefTranslatorTestScopedLibraryChildChild,
+                cef_translator_test_scoped_library_child_child_t>::
+    UnwrapDerivedOwn(CefWrapperType type,
+                     CefOwnPtr<CefTranslatorTestScopedLibraryChildChild> c) {
  NOTREACHED() << "Unexpected class type: " << type;
  return NULL;
 }

-template<> cef_translator_test_scoped_library_child_child_t* CefCToCppScoped<CefTranslatorTestScopedLibraryChildChildCToCpp,
-    CefTranslatorTestScopedLibraryChildChild,
-    cef_translator_test_scoped_library_child_child_t>::UnwrapDerivedRaw(
-    CefWrapperType type,
-    CefRawPtr<CefTranslatorTestScopedLibraryChildChild> c) {
+template <>
+cef_translator_test_scoped_library_child_child_t*
+CefCToCppScoped<CefTranslatorTestScopedLibraryChildChildCToCpp,
+                CefTranslatorTestScopedLibraryChildChild,
+                cef_translator_test_scoped_library_child_child_t>::
+    UnwrapDerivedRaw(CefWrapperType type,
+                     CefRawPtr<CefTranslatorTestScopedLibraryChildChild> c) {
  NOTREACHED() << "Unexpected class type: " << type;
  return NULL;
 }

 #if DCHECK_IS_ON()
-template<> base::AtomicRefCount CefCToCppScoped<CefTranslatorTestScopedLibraryChildChildCToCpp,
+template <>
+base::AtomicRefCount CefCToCppScoped<
+    CefTranslatorTestScopedLibraryChildChildCToCpp,
    CefTranslatorTestScopedLibraryChildChild,
    cef_translator_test_scoped_library_child_child_t>::DebugObjCt = 0;
 #endif

-template<> CefWrapperType CefCToCppScoped<CefTranslatorTestScopedLibraryChildChildCToCpp,
+template <>
+CefWrapperType CefCToCppScoped<
+    CefTranslatorTestScopedLibraryChildChildCToCpp,
    CefTranslatorTestScopedLibraryChildChild,
    cef_translator_test_scoped_library_child_child_t>::kWrapperType =
    WT_TRANSLATOR_TEST_SCOPED_LIBRARY_CHILD_CHILD;
--- a/libcef_dll/ctocpp/test/translator_test_scoped_library_child_child_ctocpp.h
+++ b/libcef_dll/ctocpp/test/translator_test_scoped_library_child_child_ctocpp.h
@@ -9,6 +9,8 @@
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
+// $hash=ede7264f245eb85561218f7c397b376cfcd6c881$
+//

 #ifndef CEF_LIBCEF_DLL_CTOCPP_TEST_TRANSLATOR_TEST_SCOPED_LIBRARY_CHILD_CHILD_CTOCPP_H_
 #define CEF_LIBCEF_DLL_CTOCPP_TEST_TRANSLATOR_TEST_SCOPED_LIBRARY_CHILD_CHILD_CTOCPP_H_
@@ -18,16 +20,16 @@
 #error This file can be included wrapper-side only
 #endif

-#include "include/test/cef_translator_test.h"
 #include "include/capi/test/cef_translator_test_capi.h"
+#include "include/test/cef_translator_test.h"
 #include "libcef_dll/ctocpp/ctocpp_scoped.h"

 // Wrap a C structure with a C++ class.
 // This class may be instantiated and accessed wrapper-side only.
 class CefTranslatorTestScopedLibraryChildChildCToCpp
    : public CefCToCppScoped<CefTranslatorTestScopedLibraryChildChildCToCpp,
-        CefTranslatorTestScopedLibraryChildChild,
-        cef_translator_test_scoped_library_child_child_t> {
+                             CefTranslatorTestScopedLibraryChildChild,
+                             cef_translator_test_scoped_library_child_child_t> {
 public:
  CefTranslatorTestScopedLibraryChildChildCToCpp();

--- a/libcef_dll/ctocpp/test/translator_test_scoped_library_child_ctocpp.cc
+++ b/libcef_dll/ctocpp/test/translator_test_scoped_library_child_ctocpp.cc
@@ -9,28 +9,26 @@
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
+// $hash=5af91636e08968269d7630c7af4a4c43510cffac$
+//

-#include "libcef_dll/ctocpp/test/translator_test_scoped_library_child_ctocpp.h"
 #include "libcef_dll/ctocpp/test/translator_test_scoped_library_child_child_ctocpp.h"
-
+#include "libcef_dll/ctocpp/test/translator_test_scoped_library_child_ctocpp.h"

 // STATIC METHODS - Body may be edited by hand.

-CefOwnPtr<CefTranslatorTestScopedLibraryChild> CefTranslatorTestScopedLibraryChild::Create(
-    int value, int other_value) {
+CefOwnPtr<CefTranslatorTestScopedLibraryChild>
+CefTranslatorTestScopedLibraryChild::Create(int value, int other_value) {
  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING

  // Execute
  cef_translator_test_scoped_library_child_t* _retval =
-      cef_translator_test_scoped_library_child_create(
-      value,
-      other_value);
+      cef_translator_test_scoped_library_child_create(value, other_value);

  // Return type: ownptr_same
  return CefTranslatorTestScopedLibraryChildCToCpp::Wrap(_retval);
 }

-
 // VIRTUAL METHODS - Body may be edited by hand.

 int CefTranslatorTestScopedLibraryChildCToCpp::GetOtherValue() {
@@ -55,8 +53,7 @@ void CefTranslatorTestScopedLibraryChildCToCpp::SetOtherValue(int value) {
  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING

  // Execute
-  _struct->set_other_value(_struct,
-      value);
+  _struct->set_other_value(_struct, value);
 }

 int CefTranslatorTestScopedLibraryChildCToCpp::GetValue() {
@@ -83,54 +80,61 @@ void CefTranslatorTestScopedLibraryChildCToCpp::SetValue(int value) {
  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING

  // Execute
-  _struct->set_value(_struct,
-      value);
+  _struct->set_value(_struct, value);
 }

-
 // CONSTRUCTOR - Do not edit by hand.

-CefTranslatorTestScopedLibraryChildCToCpp::CefTranslatorTestScopedLibraryChildCToCpp(
-    ) {
-}
+CefTranslatorTestScopedLibraryChildCToCpp::
+    CefTranslatorTestScopedLibraryChildCToCpp() {}

-template<> cef_translator_test_scoped_library_child_t* CefCToCppScoped<CefTranslatorTestScopedLibraryChildCToCpp,
-    CefTranslatorTestScopedLibraryChild,
-    cef_translator_test_scoped_library_child_t>::UnwrapDerivedOwn(
-    CefWrapperType type, CefOwnPtr<CefTranslatorTestScopedLibraryChild> c) {
+template <>
+cef_translator_test_scoped_library_child_t*
+CefCToCppScoped<CefTranslatorTestScopedLibraryChildCToCpp,
+                CefTranslatorTestScopedLibraryChild,
+                cef_translator_test_scoped_library_child_t>::
+    UnwrapDerivedOwn(CefWrapperType type,
+                     CefOwnPtr<CefTranslatorTestScopedLibraryChild> c) {
  if (type == WT_TRANSLATOR_TEST_SCOPED_LIBRARY_CHILD_CHILD) {
    return reinterpret_cast<cef_translator_test_scoped_library_child_t*>(
        CefTranslatorTestScopedLibraryChildChildCToCpp::UnwrapOwn(
-        CefOwnPtr<CefTranslatorTestScopedLibraryChildChild>(
-        reinterpret_cast<CefTranslatorTestScopedLibraryChildChild*>(c.release(
-        )))));
+            CefOwnPtr<CefTranslatorTestScopedLibraryChildChild>(
+                reinterpret_cast<CefTranslatorTestScopedLibraryChildChild*>(
+                    c.release()))));
  }
  NOTREACHED() << "Unexpected class type: " << type;
  return NULL;
 }

-template<> cef_translator_test_scoped_library_child_t* CefCToCppScoped<CefTranslatorTestScopedLibraryChildCToCpp,
-    CefTranslatorTestScopedLibraryChild,
-    cef_translator_test_scoped_library_child_t>::UnwrapDerivedRaw(
-    CefWrapperType type, CefRawPtr<CefTranslatorTestScopedLibraryChild> c) {
+template <>
+cef_translator_test_scoped_library_child_t*
+CefCToCppScoped<CefTranslatorTestScopedLibraryChildCToCpp,
+                CefTranslatorTestScopedLibraryChild,
+                cef_translator_test_scoped_library_child_t>::
+    UnwrapDerivedRaw(CefWrapperType type,
+                     CefRawPtr<CefTranslatorTestScopedLibraryChild> c) {
  if (type == WT_TRANSLATOR_TEST_SCOPED_LIBRARY_CHILD_CHILD) {
    return reinterpret_cast<cef_translator_test_scoped_library_child_t*>(
        CefTranslatorTestScopedLibraryChildChildCToCpp::UnwrapRaw(
-        CefRawPtr<CefTranslatorTestScopedLibraryChildChild>(
-        reinterpret_cast<CefTranslatorTestScopedLibraryChildChild*>(
-        CEF_RAW_PTR_GET(c)))));
+            CefRawPtr<CefTranslatorTestScopedLibraryChildChild>(
+                reinterpret_cast<CefTranslatorTestScopedLibraryChildChild*>(
+                    CEF_RAW_PTR_GET(c)))));
  }
  NOTREACHED() << "Unexpected class type: " << type;
  return NULL;
 }

 #if DCHECK_IS_ON()
-template<> base::AtomicRefCount CefCToCppScoped<CefTranslatorTestScopedLibraryChildCToCpp,
-    CefTranslatorTestScopedLibraryChild,
-    cef_translator_test_scoped_library_child_t>::DebugObjCt = 0;
+template <>
+base::AtomicRefCount
+    CefCToCppScoped<CefTranslatorTestScopedLibraryChildCToCpp,
+                    CefTranslatorTestScopedLibraryChild,
+                    cef_translator_test_scoped_library_child_t>::DebugObjCt = 0;
 #endif

-template<> CefWrapperType CefCToCppScoped<CefTranslatorTestScopedLibraryChildCToCpp,
-    CefTranslatorTestScopedLibraryChild,
-    cef_translator_test_scoped_library_child_t>::kWrapperType =
-    WT_TRANSLATOR_TEST_SCOPED_LIBRARY_CHILD;
+template <>
+CefWrapperType
+    CefCToCppScoped<CefTranslatorTestScopedLibraryChildCToCpp,
+                    CefTranslatorTestScopedLibraryChild,
+                    cef_translator_test_scoped_library_child_t>::kWrapperType =
+        WT_TRANSLATOR_TEST_SCOPED_LIBRARY_CHILD;
--- a/libcef_dll/ctocpp/test/translator_test_scoped_library_child_ctocpp.h
+++ b/libcef_dll/ctocpp/test/translator_test_scoped_library_child_ctocpp.h
@@ -9,6 +9,8 @@
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
+// $hash=d07cb0e1a08569a519ef42eafe1b2c8446b2d840$
+//

 #ifndef CEF_LIBCEF_DLL_CTOCPP_TEST_TRANSLATOR_TEST_SCOPED_LIBRARY_CHILD_CTOCPP_H_
 #define CEF_LIBCEF_DLL_CTOCPP_TEST_TRANSLATOR_TEST_SCOPED_LIBRARY_CHILD_CTOCPP_H_
@@ -18,16 +20,16 @@
 #error This file can be included wrapper-side only
 #endif

-#include "include/test/cef_translator_test.h"
 #include "include/capi/test/cef_translator_test_capi.h"
+#include "include/test/cef_translator_test.h"
 #include "libcef_dll/ctocpp/ctocpp_scoped.h"

 // Wrap a C structure with a C++ class.
 // This class may be instantiated and accessed wrapper-side only.
 class CefTranslatorTestScopedLibraryChildCToCpp
    : public CefCToCppScoped<CefTranslatorTestScopedLibraryChildCToCpp,
-        CefTranslatorTestScopedLibraryChild,
-        cef_translator_test_scoped_library_child_t> {
+                             CefTranslatorTestScopedLibraryChild,
+                             cef_translator_test_scoped_library_child_t> {
 public:
  CefTranslatorTestScopedLibraryChildCToCpp();

--- a/libcef_dll/ctocpp/test/translator_test_scoped_library_ctocpp.cc
+++ b/libcef_dll/ctocpp/test/translator_test_scoped_library_ctocpp.cc
@@ -9,28 +9,27 @@
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
+// $hash=d4d0574d3ca8e5226b711d9b5e5e3c58b26680e0$
+//

-#include "libcef_dll/ctocpp/test/translator_test_scoped_library_ctocpp.h"
-#include "libcef_dll/ctocpp/test/translator_test_scoped_library_child_ctocpp.h"
 #include "libcef_dll/ctocpp/test/translator_test_scoped_library_child_child_ctocpp.h"
-
+#include "libcef_dll/ctocpp/test/translator_test_scoped_library_child_ctocpp.h"
+#include "libcef_dll/ctocpp/test/translator_test_scoped_library_ctocpp.h"

 // STATIC METHODS - Body may be edited by hand.

-CefOwnPtr<CefTranslatorTestScopedLibrary> CefTranslatorTestScopedLibrary::Create(
-    int value) {
+CefOwnPtr<CefTranslatorTestScopedLibrary>
+CefTranslatorTestScopedLibrary::Create(int value) {
  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING

  // Execute
  cef_translator_test_scoped_library_t* _retval =
-      cef_translator_test_scoped_library_create(
-      value);
+      cef_translator_test_scoped_library_create(value);

  // Return type: ownptr_same
  return CefTranslatorTestScopedLibraryCToCpp::Wrap(_retval);
 }

-
 // VIRTUAL METHODS - Body may be edited by hand.

 int CefTranslatorTestScopedLibraryCToCpp::GetValue() {
@@ -55,66 +54,74 @@ void CefTranslatorTestScopedLibraryCToCpp::SetValue(int value) {
  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING

  // Execute
-  _struct->set_value(_struct,
-      value);
+  _struct->set_value(_struct, value);
 }

-
 // CONSTRUCTOR - Do not edit by hand.

-CefTranslatorTestScopedLibraryCToCpp::CefTranslatorTestScopedLibraryCToCpp() {
-}
+CefTranslatorTestScopedLibraryCToCpp::CefTranslatorTestScopedLibraryCToCpp() {}

-template<> cef_translator_test_scoped_library_t* CefCToCppScoped<CefTranslatorTestScopedLibraryCToCpp,
-    CefTranslatorTestScopedLibrary,
-    cef_translator_test_scoped_library_t>::UnwrapDerivedOwn(
-    CefWrapperType type, CefOwnPtr<CefTranslatorTestScopedLibrary> c) {
+template <>
+cef_translator_test_scoped_library_t*
+CefCToCppScoped<CefTranslatorTestScopedLibraryCToCpp,
+                CefTranslatorTestScopedLibrary,
+                cef_translator_test_scoped_library_t>::
+    UnwrapDerivedOwn(CefWrapperType type,
+                     CefOwnPtr<CefTranslatorTestScopedLibrary> c) {
  if (type == WT_TRANSLATOR_TEST_SCOPED_LIBRARY_CHILD) {
    return reinterpret_cast<cef_translator_test_scoped_library_t*>(
        CefTranslatorTestScopedLibraryChildCToCpp::UnwrapOwn(
-        CefOwnPtr<CefTranslatorTestScopedLibraryChild>(
-        reinterpret_cast<CefTranslatorTestScopedLibraryChild*>(c.release()))));
+            CefOwnPtr<CefTranslatorTestScopedLibraryChild>(
+                reinterpret_cast<CefTranslatorTestScopedLibraryChild*>(
+                    c.release()))));
  }
  if (type == WT_TRANSLATOR_TEST_SCOPED_LIBRARY_CHILD_CHILD) {
    return reinterpret_cast<cef_translator_test_scoped_library_t*>(
        CefTranslatorTestScopedLibraryChildChildCToCpp::UnwrapOwn(
-        CefOwnPtr<CefTranslatorTestScopedLibraryChildChild>(
-        reinterpret_cast<CefTranslatorTestScopedLibraryChildChild*>(c.release(
-        )))));
+            CefOwnPtr<CefTranslatorTestScopedLibraryChildChild>(
+                reinterpret_cast<CefTranslatorTestScopedLibraryChildChild*>(
+                    c.release()))));
  }
  NOTREACHED() << "Unexpected class type: " << type;
  return NULL;
 }

-template<> cef_translator_test_scoped_library_t* CefCToCppScoped<CefTranslatorTestScopedLibraryCToCpp,
-    CefTranslatorTestScopedLibrary,
-    cef_translator_test_scoped_library_t>::UnwrapDerivedRaw(
-    CefWrapperType type, CefRawPtr<CefTranslatorTestScopedLibrary> c) {
+template <>
+cef_translator_test_scoped_library_t*
+CefCToCppScoped<CefTranslatorTestScopedLibraryCToCpp,
+                CefTranslatorTestScopedLibrary,
+                cef_translator_test_scoped_library_t>::
+    UnwrapDerivedRaw(CefWrapperType type,
+                     CefRawPtr<CefTranslatorTestScopedLibrary> c) {
  if (type == WT_TRANSLATOR_TEST_SCOPED_LIBRARY_CHILD) {
    return reinterpret_cast<cef_translator_test_scoped_library_t*>(
        CefTranslatorTestScopedLibraryChildCToCpp::UnwrapRaw(
-        CefRawPtr<CefTranslatorTestScopedLibraryChild>(
-        reinterpret_cast<CefTranslatorTestScopedLibraryChild*>(CEF_RAW_PTR_GET(
-        c)))));
+            CefRawPtr<CefTranslatorTestScopedLibraryChild>(
+                reinterpret_cast<CefTranslatorTestScopedLibraryChild*>(
+                    CEF_RAW_PTR_GET(c)))));
  }
  if (type == WT_TRANSLATOR_TEST_SCOPED_LIBRARY_CHILD_CHILD) {
    return reinterpret_cast<cef_translator_test_scoped_library_t*>(
        CefTranslatorTestScopedLibraryChildChildCToCpp::UnwrapRaw(
-        CefRawPtr<CefTranslatorTestScopedLibraryChildChild>(
-        reinterpret_cast<CefTranslatorTestScopedLibraryChildChild*>(
-        CEF_RAW_PTR_GET(c)))));
+            CefRawPtr<CefTranslatorTestScopedLibraryChildChild>(
+                reinterpret_cast<CefTranslatorTestScopedLibraryChildChild*>(
+                    CEF_RAW_PTR_GET(c)))));
  }
  NOTREACHED() << "Unexpected class type: " << type;
  return NULL;
 }

 #if DCHECK_IS_ON()
-template<> base::AtomicRefCount CefCToCppScoped<CefTranslatorTestScopedLibraryCToCpp,
-    CefTranslatorTestScopedLibrary,
-    cef_translator_test_scoped_library_t>::DebugObjCt = 0;
+template <>
+base::AtomicRefCount
+    CefCToCppScoped<CefTranslatorTestScopedLibraryCToCpp,
+                    CefTranslatorTestScopedLibrary,
+                    cef_translator_test_scoped_library_t>::DebugObjCt = 0;
 #endif

-template<> CefWrapperType CefCToCppScoped<CefTranslatorTestScopedLibraryCToCpp,
-    CefTranslatorTestScopedLibrary,
-    cef_translator_test_scoped_library_t>::kWrapperType =
-    WT_TRANSLATOR_TEST_SCOPED_LIBRARY;
+template <>
+CefWrapperType
+    CefCToCppScoped<CefTranslatorTestScopedLibraryCToCpp,
+                    CefTranslatorTestScopedLibrary,
+                    cef_translator_test_scoped_library_t>::kWrapperType =
+        WT_TRANSLATOR_TEST_SCOPED_LIBRARY;
--- a/libcef_dll/ctocpp/test/translator_test_scoped_library_ctocpp.h
+++ b/libcef_dll/ctocpp/test/translator_test_scoped_library_ctocpp.h
@@ -9,6 +9,8 @@
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
+// $hash=7615ff956f45991a56cad535593fc68da2a73aa4$
+//

 #ifndef CEF_LIBCEF_DLL_CTOCPP_TEST_TRANSLATOR_TEST_SCOPED_LIBRARY_CTOCPP_H_
 #define CEF_LIBCEF_DLL_CTOCPP_TEST_TRANSLATOR_TEST_SCOPED_LIBRARY_CTOCPP_H_
@@ -18,16 +20,16 @@
 #error This file can be included wrapper-side only
 #endif

-#include "include/test/cef_translator_test.h"
 #include "include/capi/test/cef_translator_test_capi.h"
+#include "include/test/cef_translator_test.h"
 #include "libcef_dll/ctocpp/ctocpp_scoped.h"

 // Wrap a C structure with a C++ class.
 // This class may be instantiated and accessed wrapper-side only.
 class CefTranslatorTestScopedLibraryCToCpp
    : public CefCToCppScoped<CefTranslatorTestScopedLibraryCToCpp,
-        CefTranslatorTestScopedLibrary,
-        cef_translator_test_scoped_library_t> {
+                             CefTranslatorTestScopedLibrary,
+                             cef_translator_test_scoped_library_t> {
 public:
  CefTranslatorTestScopedLibraryCToCpp();