Merge to XFA: Fix issuse with != and == shown by fx_basic_bstring unit tests.

core/src/fxcrt/fx_basic_bstring_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, ByteStringOperatorSubscript) {
     // CFX_ByteString includes the NUL terminator for non-empty strings.
@@ skipping 65 matching lines @@
     CFX_ByteStringC byte_string_c3("hellod");
     ASSERT_FALSE(byte_string == byte_string_c1);
     ASSERT_FALSE(byte_string == byte_string_c2);
     ASSERT_FALSE(byte_string == byte_string_c3);
     ASSERT_FALSE(byte_string_c1 == byte_string);
     ASSERT_FALSE(byte_string_c2 == byte_string);
     ASSERT_FALSE(byte_string_c3 == byte_string);
 
     const char* c_string_same1 = "hello";
     ASSERT_TRUE(byte_string == c_string_same1);
-#if 0
-    // TODO(tsepez): See, you don't want implicit c_str() casting.
-    // This degrades to a pointer comparision, which flunks.
     ASSERT_TRUE(c_string_same1 == byte_string);
-#endif
 
     const char* c_string1 = "he";
     const char* c_string2 = "hellp";
     const char* c_string3 = "hellod";
     ASSERT_FALSE(byte_string == c_string1);
     ASSERT_FALSE(byte_string == c_string2);
     ASSERT_FALSE(byte_string == c_string3);
     ASSERT_FALSE(c_string1 == byte_string);
     ASSERT_FALSE(c_string2 == byte_string);
     ASSERT_FALSE(c_string3 == byte_string);
@@ skipping 30 matching lines @@
     CFX_ByteStringC byte_string_c3("hellod");
     ASSERT_TRUE(byte_string != byte_string_c1);
     ASSERT_TRUE(byte_string != byte_string_c2);
     ASSERT_TRUE(byte_string != byte_string_c3);
     ASSERT_TRUE(byte_string_c1 != byte_string);
     ASSERT_TRUE(byte_string_c2 != byte_string);
     ASSERT_TRUE(byte_string_c3 != byte_string);
 
     const char* c_string_same1 = "hello";
     ASSERT_FALSE(byte_string != c_string_same1);
-#if 0
-    // See above TODO.
     ASSERT_FALSE(c_string_same1 != byte_string);
-#endif
+
     const char* c_string1 = "he";
     const char* c_string2 = "hellp";
     const char* c_string3 = "hellod";
     ASSERT_TRUE(byte_string != c_string1);
     ASSERT_TRUE(byte_string != c_string2);
     ASSERT_TRUE(byte_string != c_string3);
     ASSERT_TRUE(c_string1 != byte_string);
     ASSERT_TRUE(c_string2 != byte_string);
     ASSERT_TRUE(c_string3 != byte_string);
 }
@@ skipping 253 matching lines @@
     CFX_ByteString byte_string3("hellod");
     ASSERT_FALSE(byte_string_c == byte_string1);
     ASSERT_FALSE(byte_string_c == byte_string2);
     ASSERT_FALSE(byte_string_c == byte_string3);
     ASSERT_FALSE(byte_string1 == byte_string_c);
     ASSERT_FALSE(byte_string2 == byte_string_c);
     ASSERT_FALSE(byte_string3 == byte_string_c);
 
     const char* c_string_same1 = "hello";
     ASSERT_TRUE(byte_string_c == c_string_same1);
-#if 0
-    // TODO(tsepez): missing operator (but no implicit cast to c_str).
     ASSERT_TRUE(c_string_same1 == byte_string_c);
-#endif
 
     const char* c_string1 = "he";
     const char* c_string2 = "hellp";
     const char* c_string3 = "hellod";
     ASSERT_FALSE(byte_string_c == c_string1);
     ASSERT_FALSE(byte_string_c == c_string2);
     ASSERT_FALSE(byte_string_c == c_string3);
-#if 0
-    // See above TODO.
+
     ASSERT_FALSE(c_string1 == byte_string_c);
     ASSERT_FALSE(c_string2 == byte_string_c);
     ASSERT_FALSE(c_string3 == byte_string_c);
-#endif
 }
 
 TEST(fxcrt, ByteStringCOperatorNE) {
     CFX_ByteStringC byte_string_c("hello");
     ASSERT_FALSE(byte_string_c != byte_string_c);
 
     CFX_ByteStringC byte_string_c_same1("hello");
     ASSERT_FALSE(byte_string_c != byte_string_c_same1);
     ASSERT_FALSE(byte_string_c_same1 != byte_string_c);
 
@@ skipping 20 matching lines @@
     CFX_ByteString byte_string3("hellod");
     ASSERT_TRUE(byte_string_c != byte_string1);
     ASSERT_TRUE(byte_string_c != byte_string2);
     ASSERT_TRUE(byte_string_c != byte_string3);
     ASSERT_TRUE(byte_string1 != byte_string_c);
     ASSERT_TRUE(byte_string2 != byte_string_c);
     ASSERT_TRUE(byte_string3 != byte_string_c);
 
     const char* c_string_same1 = "hello";
     ASSERT_FALSE(byte_string_c != c_string_same1);
-#if 0
-    // TODO(tsepez): missing operator (but no implicit cast to c_str).
     ASSERT_FALSE(c_string_same1 != byte_string_c);
-#endif
 
     const char* c_string1 = "he";
     const char* c_string2 = "hellp";
     const char* c_string3 = "hellod";
     ASSERT_TRUE(byte_string_c != c_string1);
     ASSERT_TRUE(byte_string_c != c_string2);
     ASSERT_TRUE(byte_string_c != c_string3);
-#if 0
-    // See above TODO.
+
     ASSERT_TRUE(c_string1 != byte_string_c);
     ASSERT_TRUE(c_string2 != byte_string_c);
     ASSERT_TRUE(c_string3 != byte_string_c);
-#endif
 }