Source release v2.2.0-0-903 + third_party libs

Change-Id: I03f670eaeb052bc741abb347be06f8ddc58418e7
2014-12-15 10:35:08 -08:00
parent 5318232d46
commit 1955c9c2c9
85 changed files with 5594 additions and 2830 deletions
--- a/core/test/http_socket.h
+++ b/core/test/http_socket.h
@@ -32,12 +32,9 @@ class HttpSocket {
  int Write(const char* data, int len, int timeout_in_ms);

 private:
-  static bool ParseUrl(const std::string& url,
-                       std::string* scheme,
-                       bool* secure_connect,
-                       std::string* domain_name,
-                       int* port,
-                       std::string* path);
+  static bool ParseUrl(const std::string& url, std::string* scheme,
+                       bool* secure_connect, std::string* domain_name,
+                       int* port, std::string* path);
  FRIEND_TEST(HttpSocketTest, ParseUrlTest);

  std::string scheme_;