Merge to XFA: Fix issues with != and == in fx_basic_wstring

core/src/fxcrt/fx_basic_wstring_unittest.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "../../../testing/fx_string_testhelpers.h"
 #include "../../include/fxcrt/fx_basic.h"
 
 TEST(fxcrt, WideStringOperatorSubscript) {
     // CFX_WideString includes the NUL terminator for non-empty strings.
@@ skipping 65 matching lines @@
     CFX_WideStringC wide_string_c3(L"hellod");
     ASSERT_FALSE(wide_string == wide_string_c1);
     ASSERT_FALSE(wide_string == wide_string_c2);
     ASSERT_FALSE(wide_string == wide_string_c3);
     ASSERT_FALSE(wide_string_c1 == wide_string);
     ASSERT_FALSE(wide_string_c2 == wide_string);
     ASSERT_FALSE(wide_string_c3 == wide_string);
 
     const wchar_t* c_string_same1 = L"hello";
     ASSERT_TRUE(wide_string == c_string_same1);
-#if 0
-    // TODO(tsepez): Missing operator - there's a prototype but no actual
-    // implementation (at least we already removed implicit c_str() casting).
     ASSERT_TRUE(c_string_same1 == wide_string);
-#endif
 
     const wchar_t* c_string1 = L"he";
     const wchar_t* c_string2 = L"hellp";
     const wchar_t* c_string3 = L"hellod";
     ASSERT_FALSE(wide_string == c_string1);
     ASSERT_FALSE(wide_string == c_string2);
     ASSERT_FALSE(wide_string == c_string3);
-#if 0
-    // See above TODO.
     ASSERT_FALSE(c_string1 == wide_string);
     ASSERT_FALSE(c_string2 == wide_string);
     ASSERT_FALSE(c_string3 == wide_string);
-#endif
 }
 
 TEST(fxcrt, WideStringOperatorNE) {
     CFX_WideString wide_string(L"hello");
     ASSERT_FALSE(wide_string != wide_string);
 
     CFX_WideString wide_string_same1(L"hello");
     ASSERT_FALSE(wide_string != wide_string_same1);
     ASSERT_FALSE(wide_string_same1 != wide_string);
 
@@ skipping 20 matching lines @@
     CFX_WideStringC wide_string_c3(L"hellod");
     ASSERT_TRUE(wide_string != wide_string_c1);
     ASSERT_TRUE(wide_string != wide_string_c2);
     ASSERT_TRUE(wide_string != wide_string_c3);
     ASSERT_TRUE(wide_string_c1 != wide_string);
     ASSERT_TRUE(wide_string_c2 != wide_string);
     ASSERT_TRUE(wide_string_c3 != wide_string);
 
     const wchar_t* c_string_same1 = L"hello";
     ASSERT_FALSE(wide_string != c_string_same1);
-#if 0
-    // See above TODO.
     ASSERT_FALSE(c_string_same1 != wide_string);
-#endif
+
     const wchar_t* c_string1 = L"he";
     const wchar_t* c_string2 = L"hellp";
     const wchar_t* c_string3 = L"hellod";
     ASSERT_TRUE(wide_string != c_string1);
     ASSERT_TRUE(wide_string != c_string2);
     ASSERT_TRUE(wide_string != c_string3);
-#if 0
-    // See above TODO.
+
     ASSERT_TRUE(c_string1 != wide_string);
     ASSERT_TRUE(c_string2 != wide_string);
     ASSERT_TRUE(c_string3 != wide_string);
-#endif
 }
 
 #define ByteStringLiteral(str) CFX_ByteString(FX_BSTRC(str))
 
 TEST(fxcrt, WideStringUTF16LE_Encode) {
   struct UTF16LEEncodeCase {
     CFX_WideString ws;
     CFX_ByteString bs;
   } utf16le_encode_cases[] = {
     { L"", ByteStringLiteral("\0\0") },
@@ skipping 79 matching lines @@
     CFX_WideString wide_string1(L"he");
     CFX_WideString wide_string2(L"hellp");
     CFX_WideString wide_string3(L"hellod");
     ASSERT_FALSE(wide_string_c == wide_string1);
     ASSERT_FALSE(wide_string_c == wide_string2);
     ASSERT_FALSE(wide_string_c == wide_string3);
     ASSERT_FALSE(wide_string1 == wide_string_c);
     ASSERT_FALSE(wide_string2 == wide_string_c);
     ASSERT_FALSE(wide_string3 == wide_string_c);
 
-#if 0
-    // TODO(tsepez): ambiguos overload prevents compilation
     const wchar_t* c_string_same1 = L"hello";
     ASSERT_TRUE(wide_string_c == c_string_same1);
     ASSERT_TRUE(c_string_same1 == wide_string_c);
 
     const wchar_t* c_string1 = L"he";
     const wchar_t* c_string2 = L"hellp";
     const wchar_t* c_string3 = L"hellod";
     ASSERT_FALSE(wide_string_c == c_string1);
     ASSERT_FALSE(wide_string_c == c_string2);
     ASSERT_FALSE(wide_string_c == c_string3);
 
     ASSERT_FALSE(c_string1 == wide_string_c);
     ASSERT_FALSE(c_string2 == wide_string_c);
     ASSERT_FALSE(c_string3 == wide_string_c);
-#endif
 }
 
 TEST(fxcrt, WideStringCOperatorNE) {
     CFX_WideStringC wide_string_c(L"hello");
     ASSERT_FALSE(wide_string_c != wide_string_c);
 
     CFX_WideStringC wide_string_c_same1(L"hello");
     ASSERT_FALSE(wide_string_c != wide_string_c_same1);
     ASSERT_FALSE(wide_string_c_same1 != wide_string_c);
 
@@ skipping 18 matching lines @@
     CFX_WideString wide_string1(L"he");
     CFX_WideString wide_string2(L"hellp");
     CFX_WideString wide_string3(L"hellod");
     ASSERT_TRUE(wide_string_c != wide_string1);
     ASSERT_TRUE(wide_string_c != wide_string2);
     ASSERT_TRUE(wide_string_c != wide_string3);
     ASSERT_TRUE(wide_string1 != wide_string_c);
     ASSERT_TRUE(wide_string2 != wide_string_c);
     ASSERT_TRUE(wide_string3 != wide_string_c);
 
-#if 0
-    // See above TODO.
     const wchar_t* c_string_same1 = L"hello";
     ASSERT_FALSE(wide_string_c != c_string_same1);
     ASSERT_FALSE(c_string_same1 != wide_string_c);
 
     const wchar_t* c_string1 = L"he";
     const wchar_t* c_string2 = L"hellp";
     const wchar_t* c_string3 = L"hellod";
     ASSERT_TRUE(wide_string_c != c_string1);
     ASSERT_TRUE(wide_string_c != c_string2);
     ASSERT_TRUE(wide_string_c != c_string3);
 
     ASSERT_TRUE(c_string1 != wide_string_c);
     ASSERT_TRUE(c_string2 != wide_string_c);
     ASSERT_TRUE(c_string3 != wide_string_c);
-#endif
 }