Revert 48186, 48196, 48198

base/scoped_bstr_win_unittest.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2006-2008 The Chromium 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 "base/scoped_bstr_win.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 static const wchar_t kTestString1[] = L"123";
 static const wchar_t kTestString2[] = L"456789";
@@ skipping 33 matching lines @@
   EXPECT_TRUE(b2 == NULL);
   SysFreeString(tmp);
 
   GiveMeABstr(b2.Receive());
   EXPECT_TRUE(b2 != NULL);
   b2.Reset();
   EXPECT_TRUE(b2.AllocateBytes(100) != NULL);
   EXPECT_TRUE(b2.ByteLength() == 100);
   EXPECT_TRUE(b2.Length() == 100 / sizeof(kTestString1[0]));
   lstrcpyW(static_cast<BSTR>(b2), kTestString1);
-  EXPECT_TRUE(lstrlen(b2) == static_cast<int>(test1_len));
+  EXPECT_TRUE(lstrlen(b2) == test1_len);
   EXPECT_TRUE(b2.Length() == 100 / sizeof(kTestString1[0]));
   b2.SetByteLen(lstrlen(b2) * sizeof(kTestString2[0]));
-  EXPECT_TRUE(lstrlen(b2) == static_cast<int>(b2.Length()));
+  EXPECT_TRUE(lstrlen(b2) == b2.Length());
 
   EXPECT_TRUE(b1.Allocate(kTestString2) != NULL);
   EXPECT_TRUE(b1.Length() == test2_len);
   b1.SetByteLen((test2_len - 1) * sizeof(kTestString2[0]));
   EXPECT_TRUE(b1.Length() == test2_len - 1);
 }
 
 }  // namespace
 
 TEST(ScopedBstrTest, ScopedBstr) {
@@ skipping 15 matching lines @@
   uint32 l2 = SysStringLen(StackBstr(kSourceStr));
   uint32 l3 = SysStringLen(system_bstr);
   EXPECT_TRUE(l1 == l2);
   EXPECT_TRUE(l2 == l3);
   EXPECT_TRUE(SysStringLen(empty) == 0);
 
   const wchar_t one_more_test[] = L"this is my const string";
   EXPECT_EQ(SysStringLen(StackBstr(one_more_test)),
             lstrlenW(one_more_test));
 }