[Cronet] Don't spam log if system cookie doesn't have creation time.

BUG=688540
TEST=components/cronet/tools/cr_cronet.py build-test | grep "Cookie"
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.android:android_cronet_tester

Review-Url: https://codereview.chromium.org/2671713006
Cr-Commit-Position: refs/heads/master@{#448982}

Author: mef

components/cronet/ios/test/cronet_http_test.mm

@@ -322,6 +322,39 @@ void StartDataTaskAndWaitForCompletion(NSURLSessionDataTask* task) {
   EXPECT_TRUE([[delegate_ responseBody] containsString:cookieValue]);
 }
 
+TEST_F(HttpTest, SystemCookieWithNullCreationTime) {
+  const char kCookieHeader[] = "Cookie";
+  NSString* cookieName = [NSString
+      stringWithFormat:@"SetSystemCookie-%@", [[NSUUID UUID] UUIDString]];
+  NSString* cookieValue = [[NSUUID UUID] UUIDString];
+  NSHTTPCookieStorage* systemCookieStorage =
+      [NSHTTPCookieStorage sharedHTTPCookieStorage];
+  NSURL* echoCookieUrl =
+      net::NSURLWithGURL(GURL(TestServer::GetEchoHeaderURL(kCookieHeader)));
+  NSHTTPCookie* nullCreationTimeCookie = [NSHTTPCookie cookieWithProperties:@{
+    NSHTTPCookiePath : [echoCookieUrl path],
+    NSHTTPCookieName : cookieName,
+    NSHTTPCookieValue : cookieValue,
+    NSHTTPCookieDomain : [echoCookieUrl host],
+    @"Created" : [NSNumber numberWithDouble:0.0],
+  }];
+  [systemCookieStorage setCookie:nullCreationTimeCookie];
+  NSHTTPCookie* normalCookie = [NSHTTPCookie cookieWithProperties:@{
+    NSHTTPCookiePath : [echoCookieUrl path],
+    NSHTTPCookieName : [cookieName stringByAppendingString:@"-normal"],
+    NSHTTPCookieValue : cookieValue,
+    NSHTTPCookieDomain : [echoCookieUrl host],
+  }];
+  [systemCookieStorage setCookie:normalCookie];
+  StartDataTaskAndWaitForCompletion([session_ dataTaskWithURL:echoCookieUrl]);
+  [systemCookieStorage deleteCookie:nullCreationTimeCookie];
+  [systemCookieStorage deleteCookie:normalCookie];
+  EXPECT_EQ(nil, [delegate_ error]);
+  // Verify that cookie set in system store was sent to the serever.
+  EXPECT_TRUE([[delegate_ responseBody] containsString:cookieName]);
+  EXPECT_TRUE([[delegate_ responseBody] containsString:cookieValue]);
+}
+
 TEST_F(HttpTest, FilterOutRequest) {
   NSURL* url =
       net::NSURLWithGURL(GURL(TestServer::GetEchoHeaderURL("User-Agent")));

ios/BUILD.gn

@@ -4,12 +4,9 @@
 
 assert(!is_component_build, "component build is unsupported on iOS")
 
-declare_args() {
-  # Control whether cronet is build (this is usually set by the script
-  # components/cronet/tools/cr_cronet.py as cronet requires specific
-  # gn args to build correctly).
-  is_cronet_build = false
+import("//ios/features.gni")
 
+declare_args() {
   # TODO(brettw) bug 684096: Remove these. These are to prevent unused
   # override warnings on iOS from the setting of the default_args in the
   # toplevel //.gn file. Since iOS doesn't compile V8, GN complains that

ios/features.gni

@@ -0,0 +1,10 @@
+# Copyright 2017 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.
+
+declare_args() {
+  # Control whether cronet is build (this is usually set by the script
+  # components/cronet/tools/cr_cronet.py as cronet requires specific
+  # gn args to build correctly).
+  is_cronet_build = false
+}

ios/net/BUILD.gn

@@ -2,10 +2,17 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//build/buildflag_header.gni")
 import("//ios/build/config.gni")
+import("//ios/features.gni")
 import("//testing/test.gni")
 import("//url/features.gni")
 
+buildflag_header("ios_net_features") {
+  header = "ios_net_features.h"
+  flags = [ "CRONET_BUILD=$is_cronet_build" ]
+}
+
 group("all_tests") {
   testonly = true
   deps = [
@@ -15,6 +22,7 @@ group("all_tests") {
 
 source_set("net") {
   deps = [
+    ":ios_net_features",
     "//base",
     "//net",
     "//url:url_features",

ios/net/cookies/cookie_store_ios.mm

@@ -28,6 +28,7 @@
 #include "ios/net/cookies/cookie_creation_time_manager.h"
 #include "ios/net/cookies/cookie_store_ios_client.h"
 #include "ios/net/cookies/system_cookie_util.h"
+#include "ios/net/ios_net_features.h"
 #import "net/base/mac/url_conversions.h"
 #include "net/cookies/cookie_util.h"
 #include "net/cookies/parsed_cookie.h"
@@ -175,11 +176,11 @@ NSInteger CompareCookies(id a, id b, void* context) {
   DCHECK(manager);
   base::Time created_a = manager->GetCreationTime(cookie_a);
   base::Time created_b = manager->GetCreationTime(cookie_b);
-#if !defined(CRNET)
+#if !BUILDFLAG(CRONET_BUILD)
   // CookieCreationTimeManager is returning creation times that are null.
-  // Since in CrNet, the cookie store is recreated on startup, let's suppress
+  // Since in Cronet, the cookie store is recreated on startup, let's suppress
   // this warning for now.
-  // TODO(huey): Instead of suppressing the warning, assign a creation time
+  // TODO(mef): Instead of suppressing the warning, assign a creation time
   // to cookies if one doesn't already exist.
   DLOG_IF(ERROR, created_a.is_null() || created_b.is_null())
       << "Cookie without creation date";