summaryrefslogtreecommitdiffstats
path: root/webkit/glue/glue_serialize_unittest.cc
diff options
context:
space:
mode:
authorevanm@google.com <evanm@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-27 22:46:31 +0000
committerevanm@google.com <evanm@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-27 22:46:31 +0000
commitdca5cbb44a2665ce7248d99fae0007ed344734cf (patch)
treee77968d2f3f085d9cab529b1b68f54d4508850a0 /webkit/glue/glue_serialize_unittest.cc
parent7b44dee2620540809ccda43ab3041a5908d775e1 (diff)
downloadchromium_src-dca5cbb44a2665ce7248d99fae0007ed344734cf.zip
chromium_src-dca5cbb44a2665ce7248d99fae0007ed344734cf.tar.gz
chromium_src-dca5cbb44a2665ce7248d99fae0007ed344734cf.tar.bz2
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
Diffstat (limited to 'webkit/glue/glue_serialize_unittest.cc')
-rw-r--r--webkit/glue/glue_serialize_unittest.cc9
1 files changed, 6 insertions, 3 deletions
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;