Source release v3.0.0-0-g8d3792b-ce + third_party

Change-Id: I399e71ddfffcd436171d1c60283c63ab4658e0b1

core/test/http_socket_test.cpp

@@ -1,13 +1,15 @@
 // Copyright 2013 Google Inc. All Rights Reserved.
 
 #include <errno.h>
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "http_socket.h"
-#include "scoped_ptr.h"
 #include "log.h"
+#include "scoped_ptr.h"
 #include "string_conversions.h"
 #include "url_request.h"
 
+namespace wvcdm {
+
 namespace {
 // Arbitrary URL for tests.
 const std::string kHttpsTestServer("https://www.google.com");
@@ -21,8 +23,6 @@ const int kHttpBufferSize = 4096;
 const int kTimeout = 3000;
 }
 
-namespace wvcdm {
-
 class HttpSocketTest : public testing::Test {
  public:
   HttpSocketTest() {}
@@ -159,7 +159,7 @@ ParseUrlTests parse_url_tests[] = {
      8888,                        // port
      "/",                         // path
     },
-    {NULL}  // list terminator
+    {NULL, NULL, false, NULL, 0, NULL}  // list terminator
 };
 
 TEST_F(HttpSocketTest, ParseUrlTest) {
@@ -204,6 +204,8 @@ TEST_F(HttpSocketTest, RoundTripTest) {
 }  // namespace wvcdm
 
 int main(int argc, char** argv) {
+  using namespace wvcdm;
+
   ::testing::InitGoogleTest(&argc, argv);
 
   std::string temp;