Remove ENABLE_PERSISTENT_SESSION_COOKIES

net/cookies/cookie_store_unittest.h

 // Copyright (c) 2012 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.
 
 #ifndef NET_COOKIES_COOKIE_STORE_UNITTEST_H_
 #define NET_COOKIES_COOKIE_STORE_UNITTEST_H_
 
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "base/string_tokenizer.h"
@@ skipping 1077 matching lines @@
 
 TYPED_TEST_P(MultiThreadedCookieStoreTest, ThreadCheckDeleteSessionCookies) {
   scoped_refptr<CookieStore> cs(this->GetCookieStore());
   CookieOptions options;
   if (!TypeParam::supports_http_only)
     options.set_include_httponly();
   EXPECT_TRUE(this->SetCookieWithOptions(cs, this->url_google_,
                                          "A=B", options));
   EXPECT_TRUE(this->SetCookieWithOptions(cs, this->url_google_,
       "B=C; expires=Mon, 18-Apr-22 22:50:13 GMT", options));
-
-#if defined(ENABLE_PERSISTENT_SESSION_COOKIES)
+  EXPECT_EQ(1, this->DeleteSessionCookies(cs));
   EXPECT_EQ(0, this->DeleteSessionCookies(cs));
-#else
-  EXPECT_EQ(1, this->DeleteSessionCookies(cs));
-#endif
-
-  EXPECT_EQ(0, this->DeleteSessionCookies(cs));
-
   EXPECT_TRUE(this->SetCookieWithOptions(cs, this->url_google_,
                                          "A=B", options));
   DeleteCallback callback(&this->other_thread_);
   base::Closure task = base::Bind(
       &net::MultiThreadedCookieStoreTest<TypeParam>::DeleteSessionCookiesTask,
       base::Unretained(this),
       cs, &callback);
   this->RunOnOtherThread(task);
   EXPECT_TRUE(callback.did_run());
-
-#if defined(ENABLE_PERSISTENT_SESSION_COOKIES)
-  EXPECT_EQ(0, callback.num_deleted());
-#else
   EXPECT_EQ(1, callback.num_deleted());
-#endif
 }
 
 REGISTER_TYPED_TEST_CASE_P(MultiThreadedCookieStoreTest,
     ThreadCheckGetCookies, ThreadCheckGetCookiesWithOptions,
     ThreadCheckGetCookiesWithInfo, ThreadCheckSetCookieWithOptions,
     ThreadCheckDeleteCookie, ThreadCheckDeleteSessionCookies);
 
 }  // namespace net
 
 #endif  // NET_COOKIES_COOKIE_STORE_UNITTEST_H_