Revert "gpu_test_expectations: Fix a -Wheader-hygiene"

src/tests/third_party/gpu_test_expectations/HowToMakeChanges.md

@@ -5,7 +5,7 @@ will allow us to merge Chromium changes easily in our ```gpu_test_expectations``
 In order to make a change to this directory, do the following:
 
  * copy the directory somewhere like in ```gpu_test_expectations_reverted```
- * in ```gpu_test_expectations_reverted``` run ```patch -p 1 -R < angle-mods.patch```
+ * in ```gpu_test_expectations_reverted``` run ```patch -p 1 -R angle-mods.patch```
  * do your changes in ```gpu_test_expectations```
  * delete angle-mods.path in both directories
  * run ```diff -rupN gpu_test_expectations_reverted gpu_test_expectations > angle-mods.patch```

src/tests/third_party/gpu_test_expectations/angle_config.h

@@ -21,27 +21,17 @@
 #define DCHECK_NE(A,B) ASSERT((A) != (B))
 #define DCHECK(X) ASSERT(X)
 #define LOG(X) std::cerr
+#define StringPrintf FormatString
 
 #define GPU_EXPORT
+#define base
 
 typedef int32_t int32;
 typedef uint32_t uint32;
 typedef int64_t int64;
 typedef uint64_t uint64;
 
-// Shim Chromium's base by importing functions in the bsae namespace.
-namespace base
-{
-    using angle::HexStringToUInt;
-    using angle::ReadFileToString;
-    using angle::SplitString;
-    using angle::SplitStringAlongWhitespace;
-
-    // StringPrintf is called differently in ANGLE but using cannot change
-    // the name of the imported function. Use a define to change the name.
-    using ::FormatString;
-    #define StringPrintf FormatString
-}
+using namespace angle;
 
 // TODO(jmadill): other platforms
 #if defined(_WIN32) || defined(_WIN64)

src/tests/third_party/gpu_test_expectations/gpu_test_config.cc

@@ -16,9 +16,6 @@ extern "C" {
 using namespace gpu;
 
 #if defined(OS_WIN)
-
-namespace base {
-
 // Disable the deprecated function warning for GetVersionEx
 #pragma warning(disable: 4996)
 
@@ -40,8 +37,6 @@ void SysInfo::OperatingSystemVersionNumbers(
   *bugfix_version = version_info.dwBuildNumber;
 }
 
-}
-
 void DeviceIDToVendorAndDevice(const std::string& id,
                                uint32* vendor_id,
                                uint32* device_id) {

src/tests/third_party/gpu_test_expectations/gpu_test_expectations_parser.cc

@@ -6,8 +6,6 @@
 
 #include "common/angleutils.h"
 
-namespace base {
-
 bool StartsWithASCII(const std::string& str,
                      const std::string& search,
                      bool case_sensitive) {
@@ -34,8 +32,6 @@ bool LowerCaseEqualsASCII(const std::string& a, const char* b) {
   return DoLowerCaseEqualsASCII(a.begin(), a.end(), b);
 }
 
-} // namespace base
-
 namespace gpu {
 
 namespace {