Port a few test_shell_tests. Now it runs 45 of them.

I removed some files from test_files because scons complains (warns)
when a file is both in test_files and input_files. So the files removed from
test_files also exist in input_files and at some pointed will be ported anyway.

I also made some linking stubs.

BUG=3674

Review URL: http://codereview.chromium.org/7974
Patch from Paweł Hajdan jr <phajdan.jr@gmail.com>.


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4031 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 26 insertions, 25 deletions

diff --git a/webkit/glue/autocomplete_input_listener_unittest.cc b/webkit/glue/autocomplete_input_listener_unittest.cc
index 3223a38..47b9ac5 100644
--- a/webkit/glue/autocomplete_input_listener_unittest.cc
+++ b/webkit/glue/autocomplete_input_listener_unittest.cc
@@ -76,9 +76,9 @@ class TestAutocompleteEditDelegate : public AutocompleteEditDelegate {
 class TestAutocompleteInputListener : public AutocompleteInputListener {
  public:
   TestAutocompleteInputListener(AutocompleteEditDelegate* d)
-      : blurred_(false),
-        did_request_inline_autocomplete_(false),
-        AutocompleteInputListener(d) {
+      : AutocompleteInputListener(d),
+        blurred_(false),
+        did_request_inline_autocomplete_(false) {
   }
 
   void ResetTestState() {
diff --git a/webkit/glue/cpp_variant_unittest.cc b/webkit/glue/cpp_variant_unittest.cc
index bb3ecc8..8933b85 100644
--- a/webkit/glue/cpp_variant_unittest.cc
+++ b/webkit/glue/cpp_variant_unittest.cc
@@ -53,7 +53,7 @@ int g_deallocate_call_count = 0;
 void CheckObject(const NPVariant& actual) {
   EXPECT_EQ(NPVariantType_Object, actual.type);
   EXPECT_TRUE(actual.value.objectValue);
-  EXPECT_EQ(1, actual.value.objectValue->referenceCount);
+  EXPECT_EQ(1U, actual.value.objectValue->referenceCount);
   EXPECT_EQ(1, g_allocate_call_count);
   EXPECT_EQ(0, g_deallocate_call_count);
 }
@@ -117,10 +117,10 @@ TEST(CppVariantTest, CopyConstructorIncrementsRefCount) {
   NPObject *object = MakeVoidObject();
   source.Set(object);
   // 2 references so far.
-  EXPECT_EQ(2, source.value.objectValue->referenceCount);
+  EXPECT_EQ(2U, source.value.objectValue->referenceCount);
   
   CppVariant dest = source;
-  EXPECT_EQ(3, dest.value.objectValue->referenceCount);
+  EXPECT_EQ(3U, dest.value.objectValue->referenceCount);
   EXPECT_EQ(1, g_allocate_call_count);
   NPN_ReleaseObject(object);
   source.SetNull();
@@ -147,11 +147,11 @@ TEST(CppVariantTest, AssignmentIncrementsRefCount) {
   NPObject *object = MakeVoidObject();
   source.Set(object);
   // 2 references so far.
-  EXPECT_EQ(2, source.value.objectValue->referenceCount);
+  EXPECT_EQ(2U, source.value.objectValue->referenceCount);
 
   CppVariant dest;
   dest = source;
-  EXPECT_EQ(3, dest.value.objectValue->referenceCount);
+  EXPECT_EQ(3U, dest.value.objectValue->referenceCount);
   EXPECT_EQ(1, g_allocate_call_count);
   
   NPN_ReleaseObject(object);
@@ -300,7 +300,6 @@ TEST(CppVariantTest, SetsSimpleTypesAndValues) {
   CheckString("std test string", cpp);
 
   // NPString
-  const char *ascii_str = "test NPString";
   NPString np_ascii_str = { "test NPString",
                             static_cast<uint32_t>(strlen("test NPString")) };
   cpp.Set(np_ascii_str);
@@ -336,9 +335,9 @@ TEST(CppVariantTest, FreeDataReleasesObject) {
   CppVariant cpp;
   NPObject* object = MakeVoidObject();
   cpp.Set(object);
-  EXPECT_EQ(2, object->referenceCount);
+  EXPECT_EQ(2U, object->referenceCount);
   cpp.FreeData();
-  EXPECT_EQ(1, object->referenceCount);
+  EXPECT_EQ(1U, object->referenceCount);
   EXPECT_EQ(0, g_deallocate_call_count);
 
   cpp.Set(object);
diff --git a/webkit/glue/glue_serialize_unittest.cc b/webkit/glue/glue_serialize_unittest.cc
index a117d14..15664ea 100644
--- a/webkit/glue/glue_serialize_unittest.cc
+++ b/webkit/glue/glue_serialize_unittest.cc
@@ -5,10 +5,7 @@
 #include "config.h"
 #include <string>
 
-#include "webkit/glue/glue_serialize.h"
-#include "testing/gtest/include/gtest/gtest.h"
 #include "base/compiler_specific.h"
-#include "base/pickle.h"
 
 MSVC_PUSH_WARNING_LEVEL(0);
 #include "CString.h"
@@ -18,6 +15,12 @@ MSVC_PUSH_WARNING_LEVEL(0);
 #include "ResourceRequest.h"
 MSVC_POP_WARNING();
 
+#undef LOG
+
+#include "base/pickle.h"
+#include "testing/gtest/include/gtest/gtest.h"
+#include "webkit/glue/glue_serialize.h"
+
 using namespace std;
 using namespace WebCore;
 using namespace webkit_glue;
diff --git a/webkit/glue/multipart_response_delegate_unittest.cc b/webkit/glue/multipart_response_delegate_unittest.cc
index 325b8ad..93bfcb2 100644
--- a/webkit/glue/multipart_response_delegate_unittest.cc
+++ b/webkit/glue/multipart_response_delegate_unittest.cc
@@ -13,7 +13,6 @@ MSVC_PUSH_WARNING_LEVEL(0);
 #include "ResourceResponse.h"
 #include "ResourceHandle.h"
 #include "ResourceHandleClient.h"
-#include "String.h"
 MSVC_POP_WARNING();
 
 #include "base/basictypes.h"
@@ -89,7 +88,7 @@ TEST(MultipartResponseTest, Functions) {
     { "Line\rLine", 4, 1 },
     { "Line\r\rLine", 4, 1 },
   };
-  for (int i = 0; i < arraysize(line_tests); ++i) {
+  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(line_tests); ++i) {
     EXPECT_EQ(line_tests[i].expected,
               delegate.PushOverLine(line_tests[i].input,
                                     line_tests[i].position));
@@ -111,7 +110,7 @@ TEST(MultipartResponseTest, Functions) {
     { "Foo: bar\r\nBaz:\n", false, 0, "Foo: bar\r\nBaz:\n" },
     { "\r\n", true, 1, "" },
   };
-  for (int i = 0; i < arraysize(header_tests); ++i) {
+  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(header_tests); ++i) {
     client.Reset();
     delegate.data_.assign(header_tests[i].data);
     EXPECT_EQ(header_tests[i].rv,
@@ -154,7 +153,7 @@ TEST(MultipartResponseTest, Functions) {
     { "foo", "bound", string::npos },
     { "bound", "--boundbound", 0 },
   };
-  for (int i = 0; i < arraysize(boundary_tests); ++i) {
+  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(boundary_tests); ++i) {
     delegate.boundary_.assign(boundary_tests[i].boundary);
     delegate.data_.assign(boundary_tests[i].data);
     EXPECT_EQ(boundary_tests[i].position,
@@ -425,7 +424,7 @@ TEST(MultipartResponseTest, MultipartByteRangeParsingTest) {
   result = MultipartResponseDelegate::ReadMultipartBoundary(
       response3, &multipart_boundary);
   EXPECT_EQ(result, false);
-  EXPECT_EQ(multipart_boundary.length(), 0);
+  EXPECT_EQ(multipart_boundary.length(), 0U);
 }
 
 TEST(MultipartResponseTest, MultipartContentRangesTest) {
diff --git a/webkit/glue/password_autocomplete_listener_unittest.cc b/webkit/glue/password_autocomplete_listener_unittest.cc
index 072cdff..53623d1 100644
--- a/webkit/glue/password_autocomplete_listener_unittest.cc
+++ b/webkit/glue/password_autocomplete_listener_unittest.cc
@@ -35,12 +35,12 @@ using webkit_glue::HTMLInputDelegate;
 
 class TestHTMLInputDelegate : public HTMLInputDelegate {
  public:
-  TestHTMLInputDelegate() : did_call_on_finish_(false),
+  TestHTMLInputDelegate() : HTMLInputDelegate(NULL),
+                            did_call_on_finish_(false),
                             did_set_value_(false),
                             did_set_selection_(false),
                             selection_start_(0),
-                            selection_end_(0),
-                            HTMLInputDelegate(NULL) {
+                            selection_end_(0) {
   }
 
   // Override those methods we implicitly invoke in the tests.
@@ -163,7 +163,7 @@ TEST_F(PasswordManagerAutocompleteTests, OnInlineAutocompleteNeeded) {
   EXPECT_EQ(username1_, username_delegate->GetValue());
   EXPECT_EQ(password1_, password_delegate->GetValue());
   // And the selection should have been set to 'lice', the last 4 letters.
-  EXPECT_EQ(1, username_delegate->selection_start());
+  EXPECT_EQ(1U, username_delegate->selection_start());
   EXPECT_EQ(username1_.length(), username_delegate->selection_end());
   // And both fields should have observed OnFinishedAutocompleting.
   EXPECT_TRUE(username_delegate->did_call_on_finish());
@@ -175,7 +175,7 @@ TEST_F(PasswordManagerAutocompleteTests, OnInlineAutocompleteNeeded) {
   // different start value.
   EXPECT_EQ(username1_, username_delegate->GetValue());
   EXPECT_EQ(password1_, password_delegate->GetValue());
-  EXPECT_EQ(2, username_delegate->selection_start());
+  EXPECT_EQ(2U, username_delegate->selection_start());
   EXPECT_EQ(username1_.length(), username_delegate->selection_end());
 
   // Now lets say the user goes astray from the stored username and types
@@ -202,7 +202,7 @@ TEST_F(PasswordManagerAutocompleteTests, OnInlineAutocompleteNeeded) {
   // The username and password fields should match the 'bob' entry.
   EXPECT_EQ(username2_, username_delegate->GetValue());
   EXPECT_EQ(password2_, password_delegate->GetValue());
-  EXPECT_EQ(1, username_delegate->selection_start());
+  EXPECT_EQ(1U, username_delegate->selection_start());
   EXPECT_EQ(username2_.length(), username_delegate->selection_end());
 
   // The End.