intermediate changes

ref:08d61438e3d4f12bbc9f1ccbacd6c8f33dc02408

5 files changed, 7 insertions, 178 deletions

diff --git a/build/rules/go/extended_lint.yaml b/build/rules/go/extended_lint.yaml
index c363a8f61af..476d2c3e0ac 100644
--- a/build/rules/go/extended_lint.yaml
+++ b/build/rules/go/extended_lint.yaml
@@ -41,3 +41,4 @@ scopes:
     - exhaustivestruct
   a.yandex-team.ru/browser/backend:
     - sqlclosecheck
+    - structtagcase
diff --git a/contrib/restricted/googletest/googlemock/CMakeLists.txt b/contrib/restricted/googletest/googlemock/CMakeLists.txt
index 34bc0daf8bf..f2ee3a43c14 100644
--- a/contrib/restricted/googletest/googlemock/CMakeLists.txt
+++ b/contrib/restricted/googletest/googlemock/CMakeLists.txt
@@ -8,20 +8,17 @@
 
 
 add_library(restricted-googletest-googlemock)
-target_compile_options(restricted-googletest-googlemock PUBLIC
-  -DGTEST_HAS_ABSL=0
-  -DGTEST_OS_FUCHSIA=0
-  -DGTEST_HAS_STD_WSTRING=1
-)
 target_include_directories(restricted-googletest-googlemock PUBLIC
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/googletest/googlemock
   ${CMAKE_SOURCE_DIR}/contrib/restricted/googletest/googlemock/include
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/googletest/googletest
   ${CMAKE_SOURCE_DIR}/contrib/restricted/googletest/googletest/include
 )
 target_include_directories(restricted-googletest-googlemock PRIVATE
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/googletest/googlemock/include
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/googletest/googletest/include
   ${CMAKE_SOURCE_DIR}/contrib/restricted/googletest/googlemock
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/googletest/googlemock/include
   ${CMAKE_SOURCE_DIR}/contrib/restricted/googletest/googletest
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/googletest/googletest/include
 )
 target_link_libraries(restricted-googletest-googlemock PUBLIC
   contrib-libs-cxxsupp
diff --git a/contrib/restricted/googletest/googlemock/gmock_main/.yandex_meta/licenses.list.txt b/contrib/restricted/googletest/googlemock/gmock_main/.yandex_meta/licenses.list.txt
deleted file mode 100644
index c2e41973c15..00000000000
--- a/contrib/restricted/googletest/googlemock/gmock_main/.yandex_meta/licenses.list.txt
+++ /dev/null
@@ -1,96 +0,0 @@
-====================BSD-3-Clause====================
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-    * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-====================COPYRIGHT====================
-Copyright 2008, Google Inc.
-All rights reserved.
-
-
-====================File: CONTRIBUTORS====================
-# This file contains a list of people who've made non-trivial
-# contribution to the Google C++ Testing Framework project.  People
-# who commit code to the project are encouraged to add their names
-# here.  Please keep the list sorted by first names.
-
-Ajay Joshi <[email protected]>
-Balázs Dán <[email protected]>
-Benoit Sigoure <[email protected]>
-Bharat Mediratta <[email protected]>
-Bogdan Piloca <[email protected]>
-Chandler Carruth <[email protected]>
-Chris Prince <[email protected]>
-Chris Taylor <[email protected]>
-Dan Egnor <[email protected]>
-Dave MacLachlan <[email protected]>
-David Anderson <[email protected]>
-Dean Sturtevant
-Eric Roman <[email protected]>
-Gene Volovich <[email protected]>
-Hady Zalek <[email protected]>
-Hal Burch <[email protected]>
-Jeffrey Yasskin <[email protected]>
-Jim Keller <[email protected]>
-Joe Walnes <[email protected]>
-Jon Wray <[email protected]>
-Jói Sigurðsson <[email protected]>
-Keir Mierle <[email protected]>
-Keith Ray <[email protected]>
-Kenton Varda <[email protected]>
-Kostya Serebryany <[email protected]>
-Krystian Kuzniarek <[email protected]>
-Lev Makhlis
-Manuel Klimek <[email protected]>
-Mario Tanev <[email protected]>
-Mark Paskin
-Markus Heule <[email protected]>
-Matthew Simmons <[email protected]>
-Mika Raento <[email protected]>
-Mike Bland <[email protected]>
-Miklós Fazekas <[email protected]>
-Neal Norwitz <[email protected]>
-Nermin Ozkiranartli <[email protected]>
-Owen Carlsen <[email protected]>
-Paneendra Ba <[email protected]>
-Pasi Valminen <[email protected]>
-Patrick Hanna <[email protected]>
-Patrick Riley <[email protected]>
-Paul Menage <[email protected]>
-Peter Kaminski <[email protected]>
-Piotr Kaminski <[email protected]>
-Preston Jackson <[email protected]>
-Rainer Klaffenboeck <[email protected]>
-Russ Cox <[email protected]>
-Russ Rufer <[email protected]>
-Sean Mcafee <[email protected]>
-Sigurður Ásgeirsson <[email protected]>
-Sverre Sundsdal <[email protected]>
-Takeshi Yoshino <[email protected]>
-Tracy Bialik <[email protected]>
-Vadim Berman <[email protected]>
-Vlad Losev <[email protected]>
-Wolfgang Klier <[email protected]>
-Zhanyong Wan <[email protected]>
diff --git a/contrib/restricted/googletest/googlemock/src/gmock_main.cc b/contrib/restricted/googletest/googlemock/src/gmock_main.cc
deleted file mode 100644
index 18c500f6639..00000000000
--- a/contrib/restricted/googletest/googlemock/src/gmock_main.cc
+++ /dev/null
@@ -1,72 +0,0 @@
-// Copyright 2008, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-#include <iostream>
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
-
-#if GTEST_OS_ESP8266 || GTEST_OS_ESP32
-#if GTEST_OS_ESP8266
-extern "C" {
-#endif
-void setup() {
-  // Since Google Mock depends on Google Test, InitGoogleMock() is
-  // also responsible for initializing Google Test.  Therefore there's
-  // no need for calling testing::InitGoogleTest() separately.
-  testing::InitGoogleMock();
-}
-void loop() { RUN_ALL_TESTS(); }
-#if GTEST_OS_ESP8266
-}
-#endif
-
-#else
-
-// MS C++ compiler/linker has a bug on Windows (not on Windows CE), which
-// causes a link error when _tmain is defined in a static library and UNICODE
-// is enabled. For this reason instead of _tmain, main function is used on
-// Windows. See the following link to track the current status of this bug:
-// https://web.archive.org/web/20170912203238/connect.microsoft.com/VisualStudio/feedback/details/394464/wmain-link-error-in-the-static-library
-// // NOLINT
-#if GTEST_OS_WINDOWS_MOBILE
-# include <tchar.h>  // NOLINT
-
-GTEST_API_ int _tmain(int argc, TCHAR** argv) {
-#else
-GTEST_API_ int main(int argc, char** argv) {
-#endif  // GTEST_OS_WINDOWS_MOBILE
-  std::cout << "Running main() from gmock_main.cc\n";
-  // Since Google Mock depends on Google Test, InitGoogleMock() is
-  // also responsible for initializing Google Test.  Therefore there's
-  // no need for calling testing::InitGoogleTest() separately.
-  testing::InitGoogleMock(&argc, argv);
-  return RUN_ALL_TESTS();
-}
-#endif
diff --git a/contrib/restricted/googletest/googletest/CMakeLists.txt b/contrib/restricted/googletest/googletest/CMakeLists.txt
index 9cc89821cfe..ae407a34edd 100644
--- a/contrib/restricted/googletest/googletest/CMakeLists.txt
+++ b/contrib/restricted/googletest/googletest/CMakeLists.txt
@@ -9,16 +9,15 @@
 
 add_library(restricted-googletest-googletest)
 target_compile_options(restricted-googletest-googletest PUBLIC
-  -DGTEST_HAS_ABSL=0
-  -DGTEST_OS_FUCHSIA=0
   -DGTEST_HAS_STD_WSTRING=1
 )
 target_include_directories(restricted-googletest-googletest PUBLIC
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/googletest/googletest
   ${CMAKE_SOURCE_DIR}/contrib/restricted/googletest/googletest/include
 )
 target_include_directories(restricted-googletest-googletest PRIVATE
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/googletest/googletest/include
   ${CMAKE_SOURCE_DIR}/contrib/restricted/googletest/googletest
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/googletest/googletest/include
 )
 target_link_libraries(restricted-googletest-googletest PUBLIC
   contrib-libs-cxxsupp