clang-formatting files in //net/cookies to clear up a diff.

net/cookies/cookie_monster_store_test.cc

Index: net/cookies/cookie_monster_store_test.cc
diff --git a/net/cookies/cookie_monster_store_test.cc b/net/cookies/cookie_monster_store_test.cc
index 226242a6e503c78d8f6816bd6356928145b53f82..dc371ed92e80ec64763299276ad1efa67eed5e3a 100644
--- a/net/cookies/cookie_monster_store_test.cc
+++ b/net/cookies/cookie_monster_store_test.cc
@@ -17,15 +17,14 @@
 namespace net {
 LoadedCallbackTask::LoadedCallbackTask(LoadedCallback loaded_callback,
                                        std::vector<CanonicalCookie*> cookies)
-    : loaded_callback_(loaded_callback),
-      cookies_(cookies) {
+    : loaded_callback_(loaded_callback), cookies_(cookies) {
 }
 
-LoadedCallbackTask::~LoadedCallbackTask() {}
+LoadedCallbackTask::~LoadedCallbackTask() {
+}
 
 MockPersistentCookieStore::MockPersistentCookieStore()
-    : load_return_value_(true),
-      loaded_(false) {
+    : load_return_value_(true), loaded_(false) {
 }
 
 void MockPersistentCookieStore::SetLoadExpectation(
@@ -62,19 +61,17 @@ void MockPersistentCookieStore::LoadCookiesForKey(
 }
 
 void MockPersistentCookieStore::AddCookie(const CanonicalCookie& cookie) {
-  commands_.push_back(
-      CookieStoreCommand(CookieStoreCommand::ADD, cookie));
+  commands_.push_back(CookieStoreCommand(CookieStoreCommand::ADD, cookie));
 }
 
 void MockPersistentCookieStore::UpdateCookieAccessTime(
     const CanonicalCookie& cookie) {
-  commands_.push_back(CookieStoreCommand(
-      CookieStoreCommand::UPDATE_ACCESS_TIME, cookie));
+  commands_.push_back(
+      CookieStoreCommand(CookieStoreCommand::UPDATE_ACCESS_TIME, cookie));
 }
 
 void MockPersistentCookieStore::DeleteCookie(const CanonicalCookie& cookie) {
-  commands_.push_back(
-      CookieStoreCommand(CookieStoreCommand::REMOVE, cookie));
+  commands_.push_back(CookieStoreCommand(CookieStoreCommand::REMOVE, cookie));
 }
 
 void MockPersistentCookieStore::Flush(const base::Closure& callback) {
@@ -85,9 +82,11 @@ void MockPersistentCookieStore::Flush(const base::Closure& callback) {
 void MockPersistentCookieStore::SetForceKeepSessionState() {
 }
 
-MockPersistentCookieStore::~MockPersistentCookieStore() {}
+MockPersistentCookieStore::~MockPersistentCookieStore() {
+}
 
-MockCookieMonsterDelegate::MockCookieMonsterDelegate() {}
+MockCookieMonsterDelegate::MockCookieMonsterDelegate() {
+}
 
 void MockCookieMonsterDelegate::OnCookieChanged(
     const CanonicalCookie& cookie,
@@ -97,14 +96,15 @@ void MockCookieMonsterDelegate::OnCookieChanged(
   changes_.push_back(notification);
 }
 
-void MockCookieMonsterDelegate::OnLoaded() {}
+void MockCookieMonsterDelegate::OnLoaded() {
+}
 
-MockCookieMonsterDelegate::~MockCookieMonsterDelegate() {}
+MockCookieMonsterDelegate::~MockCookieMonsterDelegate() {
+}
 
 CanonicalCookie BuildCanonicalCookie(const std::string& key,
                                      const std::string& cookie_line,
                                      const base::Time& creation_time) {
-
   // Parse the cookie line.
   ParsedCookie pc(cookie_line);
   EXPECT_TRUE(pc.IsValid());
@@ -114,24 +114,22 @@ CanonicalCookie BuildCanonicalCookie(const std::string& key,
   // functions. Would be nice to export them, and re-use here.
   EXPECT_FALSE(pc.HasMaxAge());
   EXPECT_TRUE(pc.HasPath());
-  base::Time cookie_expires = pc.HasExpires() ?
-      cookie_util::ParseCookieTime(pc.Expires()) : base::Time();
+  base::Time cookie_expires = pc.HasExpires()
+                                  ? cookie_util::ParseCookieTime(pc.Expires())
+                                  : base::Time();
   std::string cookie_path = pc.Path();
 
-  return CanonicalCookie(
-      GURL(), pc.Name(), pc.Value(), key, cookie_path,
-      creation_time, cookie_expires, creation_time,
-      pc.IsSecure(), pc.IsHttpOnly(), pc.Priority());
+  return CanonicalCookie(GURL(), pc.Name(), pc.Value(), key, cookie_path,
+                         creation_time, cookie_expires, creation_time,
+                         pc.IsSecure(), pc.IsHttpOnly(), pc.Priority());
 }
 
-void AddCookieToList(
-    const std::string& key,
-    const std::string& cookie_line,
-    const base::Time& creation_time,
-    std::vector<CanonicalCookie*>* out_list) {
-  scoped_ptr<CanonicalCookie> cookie(
-      new CanonicalCookie(
-          BuildCanonicalCookie(key, cookie_line, creation_time)));
+void AddCookieToList(const std::string& key,
+                     const std::string& cookie_line,
+                     const base::Time& creation_time,
+                     std::vector<CanonicalCookie*>* out_list) {
+  scoped_ptr<CanonicalCookie> cookie(new CanonicalCookie(
+      BuildCanonicalCookie(key, cookie_line, creation_time)));
 
   out_list->push_back(cookie.release());
 }
@@ -155,7 +153,8 @@ void MockSimplePersistentCookieStore::Load(
   loaded_ = true;
 }
 
-void MockSimplePersistentCookieStore::LoadCookiesForKey(const std::string& key,
+void MockSimplePersistentCookieStore::LoadCookiesForKey(
+    const std::string& key,
     const LoadedCallback& loaded_callback) {
   if (!loaded_) {
     Load(loaded_callback);
@@ -197,10 +196,9 @@ void MockSimplePersistentCookieStore::Flush(const base::Closure& callback) {
 void MockSimplePersistentCookieStore::SetForceKeepSessionState() {
 }
 
-CookieMonster* CreateMonsterFromStoreForGC(
-    int num_cookies,
-    int num_old_cookies,
-    int days_old) {
+CookieMonster* CreateMonsterFromStoreForGC(int num_cookies,
+                                           int num_old_cookies,
+                                           int days_old) {
   base::Time current(base::Time::Now());
   base::Time past_creation(base::Time::Now() - base::TimeDelta::FromDays(1000));
   scoped_refptr<MockSimplePersistentCookieStore> store(
@@ -211,19 +209,19 @@ CookieMonster* CreateMonsterFromStoreForGC(
         past_creation + base::TimeDelta::FromMicroseconds(i);
     base::Time expiration_time = current + base::TimeDelta::FromDays(30);
     base::Time last_access_time =
-        (i < num_old_cookies) ? current - base::TimeDelta::FromDays(days_old) :
-                                current;
+        (i < num_old_cookies) ? current - base::TimeDelta::FromDays(days_old)
+                              : current;
 
-    CanonicalCookie cc(
-        GURL(), "a", "1", base::StringPrintf("h%05d.izzle", i), "/path",
-        creation_time, expiration_time, last_access_time, false, false,
-        COOKIE_PRIORITY_DEFAULT);
+    CanonicalCookie cc(GURL(), "a", "1", base::StringPrintf("h%05d.izzle", i),
+                       "/path", creation_time, expiration_time,
+                       last_access_time, false, false, COOKIE_PRIORITY_DEFAULT);
     store->AddCookie(cc);
   }
 
   return new CookieMonster(store.get(), NULL);
 }
 
-MockSimplePersistentCookieStore::~MockSimplePersistentCookieStore() {}
+MockSimplePersistentCookieStore::~MockSimplePersistentCookieStore() {
+}
 
 }  // namespace net