Clang format slam.

net/cookies/cookie_monster_unittest.cc

 // 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.
 
 #include "net/cookies/cookie_store_unittest.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 27 matching lines @@
 using base::TimeDelta;
 
 namespace {
 
 // TODO(erikwright): Replace the pre-existing MockPersistentCookieStore (and
 // brethren) with this one, and remove the 'New' prefix.
 class NewMockPersistentCookieStore
     : public CookieMonster::PersistentCookieStore {
  public:
   MOCK_METHOD1(Load, void(const LoadedCallback& loaded_callback));
-  MOCK_METHOD2(LoadCookiesForKey, void(const std::string& key,
-                                       const LoadedCallback& loaded_callback));
+  MOCK_METHOD2(LoadCookiesForKey,
+               void(const std::string& key,
+                    const LoadedCallback& loaded_callback));
   MOCK_METHOD1(AddCookie, void(const CanonicalCookie& cc));
   MOCK_METHOD1(UpdateCookieAccessTime, void(const CanonicalCookie& cc));
   MOCK_METHOD1(DeleteCookie, void(const CanonicalCookie& cc));
   virtual void Flush(const base::Closure& callback) {
     if (!callback.is_null())
       base::MessageLoop::current()->PostTask(FROM_HERE, callback);
   }
   MOCK_METHOD0(SetForceKeepSessionState, void());
 
  private:
   virtual ~NewMockPersistentCookieStore() {}
 };
 
 const char* kTopLevelDomainPlus1 = "http://www.harvard.edu";
 const char* kTopLevelDomainPlus2 = "http://www.math.harvard.edu";
 const char* kTopLevelDomainPlus2Secure = "https://www.math.harvard.edu";
-const char* kTopLevelDomainPlus3 =
-    "http://www.bourbaki.math.harvard.edu";
+const char* kTopLevelDomainPlus3 = "http://www.bourbaki.math.harvard.edu";
 const char* kOtherDomain = "http://www.mit.edu";
 const char kUrlGoogleSpecific[] = "http://www.gmail.google.izzle";
 
 class GetCookieListCallback : public CookieCallback {
  public:
   GetCookieListCallback() {}
   explicit GetCookieListCallback(Thread* run_in_thread)
       : CookieCallback(run_in_thread) {}
 
   void Run(const CookieList& cookies) {
     cookies_ = cookies;
     CallbackEpilogue();
   }
 
   const CookieList& cookies() { return cookies_; }
 
  private:
   CookieList cookies_;
 };
 
 struct CookieMonsterTestTraits {
   static scoped_refptr<CookieStore> Create() {
     return new CookieMonster(NULL, NULL);
   }
 
-  static const bool is_cookie_monster              = true;
-  static const bool supports_http_only             = true;
-  static const bool supports_non_dotted_domains    = true;
-  static const bool supports_trailing_dots         = true;
-  static const bool filters_schemes                = true;
-  static const bool has_path_prefix_bug            = false;
+  static const bool is_cookie_monster = true;
+  static const bool supports_http_only = true;
+  static const bool supports_non_dotted_domains = true;
+  static const bool supports_trailing_dots = true;
+  static const bool filters_schemes = true;
+  static const bool has_path_prefix_bug = false;
   static const int creation_time_granularity_in_ms = 0;
 };
 
 INSTANTIATE_TYPED_TEST_CASE_P(CookieMonster,
                               CookieStoreTest,
                               CookieMonsterTestTraits);
 
 INSTANTIATE_TYPED_TEST_CASE_P(CookieMonster,
                               MultiThreadedCookieStoreTest,
                               CookieMonsterTestTraits);
 
 class CookieMonsterTest : public CookieStoreTest<CookieMonsterTestTraits> {
  protected:
-
   CookieList GetAllCookies(CookieMonster* cm) {
     DCHECK(cm);
     GetCookieListCallback callback;
     cm->GetAllCookiesAsync(
-        base::Bind(&GetCookieListCallback::Run,
-                   base::Unretained(&callback)));
+        base::Bind(&GetCookieListCallback::Run, base::Unretained(&callback)));
     RunFor(kTimeout);
     EXPECT_TRUE(callback.did_run());
     return callback.cookies();
   }
 
-  CookieList GetAllCookiesForURL(CookieMonster* cm,
-                                 const GURL& url) {
+  CookieList GetAllCookiesForURL(CookieMonster* cm, const GURL& url) {
     DCHECK(cm);
     GetCookieListCallback callback;
     cm->GetAllCookiesForURLAsync(
-        url, base::Bind(&GetCookieListCallback::Run,
-                        base::Unretained(&callback)));
+        url,
+        base::Bind(&GetCookieListCallback::Run, base::Unretained(&callback)));
     RunFor(kTimeout);
     EXPECT_TRUE(callback.did_run());
     return callback.cookies();
   }
 
   CookieList GetAllCookiesForURLWithOptions(CookieMonster* cm,
                                             const GURL& url,
                                             const CookieOptions& options) {
     DCHECK(cm);
     GetCookieListCallback callback;
     cm->GetAllCookiesForURLWithOptionsAsync(
-        url, options, base::Bind(&GetCookieListCallback::Run,
-                                 base::Unretained(&callback)));
+        url,
+        options,
+        base::Bind(&GetCookieListCallback::Run, base::Unretained(&callback)));
     RunFor(kTimeout);
     EXPECT_TRUE(callback.did_run());
     return callback.cookies();
   }
 
   bool SetCookieWithDetails(CookieMonster* cm,
                             const GURL& url,
                             const std::string& name,
                             const std::string& value,
                             const std::string& domain,
                             const std::string& path,
                             const base::Time& expiration_time,
                             bool secure,
                             bool http_only,
                             CookiePriority priority) {
     DCHECK(cm);
     ResultSavingCookieCallback<bool> callback;
     cm->SetCookieWithDetailsAsync(
-        url, name, value, domain, path, expiration_time, secure, http_only,
+        url,
+        name,
+        value,
+        domain,
+        path,
+        expiration_time,
+        secure,
+        http_only,
         priority,
-        base::Bind(
-            &ResultSavingCookieCallback<bool>::Run,
-            base::Unretained(&callback)));
+        base::Bind(&ResultSavingCookieCallback<bool>::Run,
+                   base::Unretained(&callback)));
     RunFor(kTimeout);
     EXPECT_TRUE(callback.did_run());
     return callback.result();
   }
 
-  int DeleteAll(CookieMonster*cm) {
+  int DeleteAll(CookieMonster* cm) {
     DCHECK(cm);
     ResultSavingCookieCallback<int> callback;
-    cm->DeleteAllAsync(
-        base::Bind(
-            &ResultSavingCookieCallback<int>::Run,
-            base::Unretained(&callback)));
+    cm->DeleteAllAsync(base::Bind(&ResultSavingCookieCallback<int>::Run,
+                                  base::Unretained(&callback)));
     RunFor(kTimeout);
     EXPECT_TRUE(callback.did_run());
     return callback.result();
   }
 
-  int DeleteAllCreatedBetween(CookieMonster*cm,
+  int DeleteAllCreatedBetween(CookieMonster* cm,
                               const base::Time& delete_begin,
                               const base::Time& delete_end) {
     DCHECK(cm);
     ResultSavingCookieCallback<int> callback;
     cm->DeleteAllCreatedBetweenAsync(
-        delete_begin, delete_end,
-        base::Bind(
-            &ResultSavingCookieCallback<int>::Run,
-            base::Unretained(&callback)));
+        delete_begin,
+        delete_end,
+        base::Bind(&ResultSavingCookieCallback<int>::Run,
+                   base::Unretained(&callback)));
     RunFor(kTimeout);
     EXPECT_TRUE(callback.did_run());
     return callback.result();
   }
 
   int DeleteAllCreatedBetweenForHost(CookieMonster* cm,
                                      const base::Time delete_begin,
                                      const base::Time delete_end,
                                      const GURL& url) {
     DCHECK(cm);
     ResultSavingCookieCallback<int> callback;
     cm->DeleteAllCreatedBetweenForHostAsync(
-        delete_begin, delete_end, url,
-        base::Bind(
-            &ResultSavingCookieCallback<int>::Run,
-            base::Unretained(&callback)));
+        delete_begin,
+        delete_end,
+        url,
+        base::Bind(&ResultSavingCookieCallback<int>::Run,
+                   base::Unretained(&callback)));
     RunFor(kTimeout);
     EXPECT_TRUE(callback.did_run());
     return callback.result();
   }
 
-  int DeleteAllForHost(CookieMonster* cm,
-                       const GURL& url) {
+  int DeleteAllForHost(CookieMonster* cm, const GURL& url) {
     DCHECK(cm);
     ResultSavingCookieCallback<int> callback;
-    cm->DeleteAllForHostAsync(
-        url, base::Bind(&ResultSavingCookieCallback<int>::Run,
-                        base::Unretained(&callback)));
+    cm->DeleteAllForHostAsync(url,
+                              base::Bind(&ResultSavingCookieCallback<int>::Run,
+                                         base::Unretained(&callback)));
     RunFor(kTimeout);
     EXPECT_TRUE(callback.did_run());
     return callback.result();
   }
 
   bool DeleteCanonicalCookie(CookieMonster* cm, const CanonicalCookie& cookie) {
     DCHECK(cm);
     ResultSavingCookieCallback<bool> callback;
     cm->DeleteCanonicalCookieAsync(
         cookie,
@@ skipping 170 matching lines @@
 
   Time GetFirstCookieAccessDate(CookieMonster* cm) {
     const CookieList all_cookies(this->GetAllCookies(cm));
     return all_cookies.front().LastAccessDate();
   }
 
   bool FindAndDeleteCookie(CookieMonster* cm,
                            const std::string& domain,
                            const std::string& name) {
     CookieList cookies = this->GetAllCookies(cm);
-    for (CookieList::iterator it = cookies.begin();
-         it != cookies.end(); ++it)
+    for (CookieList::iterator it = cookies.begin(); it != cookies.end(); ++it)
       if (it->Domain() == domain && it->Name() == name)
         return this->DeleteCanonicalCookie(cm, *it);
     return false;
   }
 
   int CountInString(const std::string& str, char c) {
     return std::count(str.begin(), str.end(), c);
   }
 
   void TestHostGarbageCollectHelper() {
@@ skipping 79 matching lines @@
                               size_t expected_high_count) {
     DeleteAll(cm);
     int next_cookie_id = 0;
     std::vector<CookiePriority> priority_list;
     std::vector<int> id_list[3];  // Indexed by CookiePriority.
 
     // Parse |coded_priority_str| and add cookies.
     std::vector<std::string> priority_tok_list;
     base::SplitString(coded_priority_str, ' ', &priority_tok_list);
     for (std::vector<std::string>::iterator it = priority_tok_list.begin();
-         it != priority_tok_list.end(); ++it) {
+         it != priority_tok_list.end();
+         ++it) {
       size_t len = it->length();
       DCHECK_NE(len, 0U);
       // Take last character as priority.
       CookiePriority priority = CharToPriority((*it)[len - 1]);
       std::string priority_str = CookiePriorityToString(priority);
       // The rest of the string (possibly empty) specifies repetition.
       int rep = 1;
       if (!it->empty()) {
         bool result = base::StringToInt(
             base::StringPiece(it->begin(), it->end() - 1), &rep);
         DCHECK(result);
       }
       for (; rep > 0; --rep, ++next_cookie_id) {
         std::string cookie = base::StringPrintf(
             "a%d=b;priority=%s", next_cookie_id, priority_str.c_str());
         EXPECT_TRUE(SetCookie(cm, url_google_, cookie));
         priority_list.push_back(priority);
         id_list[priority].push_back(next_cookie_id);
       }
     }
 
     int num_cookies = static_cast<int>(priority_list.size());
     std::vector<int> surviving_id_list[3];  // Indexed by CookiePriority.
 
     // Parse the list of cookies
     std::string cookie_str = this->GetCookies(cm, url_google_);
     std::vector<std::string> cookie_tok_list;
     base::SplitString(cookie_str, ';', &cookie_tok_list);
     for (std::vector<std::string>::iterator it = cookie_tok_list.begin();
-         it != cookie_tok_list.end(); ++it) {
+         it != cookie_tok_list.end();
+         ++it) {
       // Assuming *it is "a#=b", so extract and parse "#" portion.
       int id = -1;
       bool result = base::StringToInt(
           base::StringPiece(it->begin() + 1, it->end() - 2), &id);
       DCHECK(result);
       DCHECK_GE(id, 0);
       DCHECK_LT(id, num_cookies);
       surviving_id_list[priority_list[id]].push_back(id);
     }
 
     // Validate each priority.
-    size_t expected_count[3] = {
-      expected_low_count, expected_medium_count, expected_high_count
-    };
+    size_t expected_count[3] = {expected_low_count, expected_medium_count,
+                                expected_high_count};
     for (int i = 0; i < 3; ++i) {
       DCHECK_LE(surviving_id_list[i].size(), id_list[i].size());
       EXPECT_EQ(expected_count[i], surviving_id_list[i].size());
       // Verify that the remaining cookies are the most recent among those
       // with the same priorities.
       if (expected_count[i] == surviving_id_list[i].size()) {
         std::sort(surviving_id_list[i].begin(), surviving_id_list[i].end());
         EXPECT_TRUE(std::equal(surviving_id_list[i].begin(),
                                surviving_id_list[i].end(),
                                id_list[i].end() - expected_count[i]));
       }
     }
   }
 
   void TestPriorityAwareGarbageCollectHelper() {
     // Hard-coding limits in the test, but use DCHECK_EQ to enforce constraint.
     DCHECK_EQ(180U, CookieMonster::kDomainMaxCookies);
-    DCHECK_EQ(150U, CookieMonster::kDomainMaxCookies -
-              CookieMonster::kDomainPurgeCookies);
+    DCHECK_EQ(
+        150U,
+        CookieMonster::kDomainMaxCookies - CookieMonster::kDomainPurgeCookies);
     DCHECK_EQ(30U, CookieMonster::kDomainCookiesQuotaLow);
     DCHECK_EQ(50U, CookieMonster::kDomainCookiesQuotaMedium);
     DCHECK_EQ(70U, CookieMonster::kDomainCookiesQuotaHigh);
 
     scoped_refptr<CookieMonster> cm(new CookieMonster(NULL, NULL));
 
     // Each test case adds 181 cookies, so 31 cookies are evicted.
     // Cookie same priority, repeated for each priority.
     TestPriorityCookieCase(cm.get(), "181L", 150U, 0U, 0U);
     TestPriorityCookieCase(cm.get(), "181M", 0U, 150U, 0U);
@@ skipping 38 matching lines @@
     CookieMonster* cm(new CookieMonster(NULL, NULL));
     for (int i = 0; i < num_cookies; i++) {
       SetCookie(cm, GURL(base::StringPrintf("http://h%05d.izzle", i)), "a=1");
     }
     return cm;
   }
 };
 
 // TODO(erikwright): Replace the other callbacks and synchronous helper methods
 // in this test suite with these Mocks.
-template<typename T, typename C> class MockCookieCallback {
+template <typename T, typename C>
+class MockCookieCallback {
  public:
   C AsCallback() {
     return base::Bind(&T::Invoke, base::Unretained(static_cast<T*>(this)));
   }
 };
 
 class MockGetCookiesCallback
-  : public MockCookieCallback<MockGetCookiesCallback,
-                              CookieStore::GetCookiesCallback> {
+    : public MockCookieCallback<MockGetCookiesCallback,
+                                CookieStore::GetCookiesCallback> {
  public:
   MOCK_METHOD1(Invoke, void(const std::string& cookies));
 };
 
 class MockSetCookiesCallback
-  : public MockCookieCallback<MockSetCookiesCallback,
-                              CookieStore::SetCookiesCallback> {
+    : public MockCookieCallback<MockSetCookiesCallback,
+                                CookieStore::SetCookiesCallback> {
  public:
   MOCK_METHOD1(Invoke, void(bool success));
 };
 
-class MockClosure
-  : public MockCookieCallback<MockClosure, base::Closure> {
+class MockClosure : public MockCookieCallback<MockClosure, base::Closure> {
  public:
   MOCK_METHOD0(Invoke, void(void));
 };
 
 class MockGetCookieListCallback
-  : public MockCookieCallback<MockGetCookieListCallback,
-                              CookieMonster::GetCookieListCallback> {
+    : public MockCookieCallback<MockGetCookieListCallback,
+                                CookieMonster::GetCookieListCallback> {
  public:
   MOCK_METHOD1(Invoke, void(const CookieList& cookies));
 };
 
 class MockDeleteCallback
-  : public MockCookieCallback<MockDeleteCallback,
-                              CookieMonster::DeleteCallback> {
+    : public MockCookieCallback<MockDeleteCallback,
+                                CookieMonster::DeleteCallback> {
  public:
   MOCK_METHOD1(Invoke, void(int num_deleted));
 };
 
 class MockDeleteCookieCallback
-  : public MockCookieCallback<MockDeleteCookieCallback,
-                              CookieMonster::DeleteCookieCallback> {
+    : public MockCookieCallback<MockDeleteCookieCallback,
+                                CookieMonster::DeleteCookieCallback> {
  public:
   MOCK_METHOD1(Invoke, void(bool success));
 };
 
 struct CookiesInputInfo {
   const GURL url;
   const std::string name;
   const std::string value;
   const std::string domain;
   const std::string path;
@@ skipping 15 matching lines @@
 }
 ACTION_P3(GetCookiesAction, cookie_monster, url, callback) {
   cookie_monster->GetCookiesWithOptionsAsync(
       url, CookieOptions(), callback->AsCallback());
 }
 ACTION_P4(SetCookieAction, cookie_monster, url, cookie_line, callback) {
   cookie_monster->SetCookieWithOptionsAsync(
       url, cookie_line, CookieOptions(), callback->AsCallback());
 }
 ACTION_P4(DeleteAllCreatedBetweenAction,
-          cookie_monster, delete_begin, delete_end, callback) {
+          cookie_monster,
+          delete_begin,
+          delete_end,
+          callback) {
   cookie_monster->DeleteAllCreatedBetweenAsync(
       delete_begin, delete_end, callback->AsCallback());
 }
 ACTION_P3(SetCookieWithDetailsAction, cookie_monster, cc, callback) {
-  cookie_monster->SetCookieWithDetailsAsync(
-      cc.url, cc.name, cc.value, cc.domain, cc.path, cc.expiration_time,
-      cc.secure, cc.http_only, cc.priority,
-      callback->AsCallback());
+  cookie_monster->SetCookieWithDetailsAsync(cc.url,
+                                            cc.name,
+                                            cc.value,
+                                            cc.domain,
+                                            cc.path,
+                                            cc.expiration_time,
+                                            cc.secure,
+                                            cc.http_only,
+                                            cc.priority,
+                                            callback->AsCallback());
 }
 
 ACTION_P2(GetAllCookiesAction, cookie_monster, callback) {
   cookie_monster->GetAllCookiesAsync(callback->AsCallback());
 }
 
 ACTION_P3(DeleteAllForHostAction, cookie_monster, url, callback) {
   cookie_monster->DeleteAllForHostAsync(url, callback->AsCallback());
 }
 
@@ skipping 93 matching lines @@
                                  QuitCurrentMessageLoop()));
   }
 
   // Declares an expectation that PersistentCookieStore::LoadCookiesForKey
   // will be called, saving the provided callback and sending a quit to the
   // message loop.
   void ExpectLoadForKeyCall(std::string key, bool quit_queue) {
     if (quit_queue)
       EXPECT_CALL(*persistent_store_.get(), LoadCookiesForKey(key, testing::_))
           .WillOnce(
-               testing::DoAll(PushCallbackAction(&loaded_for_key_callbacks_),
-                              QuitCurrentMessageLoop()));
+              testing::DoAll(PushCallbackAction(&loaded_for_key_callbacks_),
+                             QuitCurrentMessageLoop()));
     else
       EXPECT_CALL(*persistent_store_.get(), LoadCookiesForKey(key, testing::_))
           .WillOnce(PushCallbackAction(&loaded_for_key_callbacks_));
   }
 
   // Invokes the initial action.
   MOCK_METHOD0(Begin, void(void));
 
   // Returns the CookieMonster instance under test.
   CookieMonster& cookie_monster() { return *cookie_monster_.get(); }
 
  private:
   // Declares that mock expectations in this test suite are strictly ordered.
   testing::InSequence in_sequence_;
   // Holds cookies to be returned from PersistentCookieStore::Load or
   // PersistentCookieStore::LoadCookiesForKey.
   std::vector<CanonicalCookie*> loaded_cookies_;
   // Stores the callback passed from the CookieMonster to the
   // PersistentCookieStore::Load
   CookieMonster::PersistentCookieStore::LoadedCallback loaded_callback_;
   // Stores the callback passed from the CookieMonster to the
   // PersistentCookieStore::LoadCookiesForKey
   std::queue<CookieMonster::PersistentCookieStore::LoadedCallback>
-    loaded_for_key_callbacks_;
+      loaded_for_key_callbacks_;
 
   // Stores the CookieMonster under test.
   scoped_refptr<CookieMonster> cookie_monster_;
   // Stores the mock PersistentCookieStore.
   scoped_refptr<NewMockPersistentCookieStore> persistent_store_;
 };
 
 TEST_F(DeferredCookieTaskTest, DeferredGetCookies) {
   DeclareLoadedCookie("www.google.izzle",
                       "X=1; path=/; expires=Mon, 18-Apr-22 22:50:14 GMT",
                       Time::Now() + TimeDelta::FromDays(3));
 
   MockGetCookiesCallback get_cookies_callback;
 
-  BeginWithForDomainKey("google.izzle", GetCookiesAction(
-      &cookie_monster(), url_google_, &get_cookies_callback));
+  BeginWithForDomainKey(
+      "google.izzle",
+      GetCookiesAction(&cookie_monster(), url_google_, &get_cookies_callback));
 
   WaitForLoadCall();
 
   EXPECT_CALL(get_cookies_callback, Invoke("X=1")).WillOnce(
       GetCookiesAction(&cookie_monster(), url_google_, &get_cookies_callback));
-  EXPECT_CALL(get_cookies_callback, Invoke("X=1")).WillOnce(
-      QuitCurrentMessageLoop());
+  EXPECT_CALL(get_cookies_callback, Invoke("X=1"))
+      .WillOnce(QuitCurrentMessageLoop());
 
   CompleteLoadingAndWait();
 }
 
 TEST_F(DeferredCookieTaskTest, DeferredSetCookie) {
   MockSetCookiesCallback set_cookies_callback;
 
-  BeginWithForDomainKey("google.izzle", SetCookieAction(
-      &cookie_monster(), url_google_, "A=B", &set_cookies_callback));
+  BeginWithForDomainKey(
+      "google.izzle",
+      SetCookieAction(
+          &cookie_monster(), url_google_, "A=B", &set_cookies_callback));
 
   WaitForLoadCall();
 
-  EXPECT_CALL(set_cookies_callback, Invoke(true)).WillOnce(
-      SetCookieAction(
-          &cookie_monster(), url_google_, "X=Y", &set_cookies_callback));
-  EXPECT_CALL(set_cookies_callback, Invoke(true)).WillOnce(
-      QuitCurrentMessageLoop());
+  EXPECT_CALL(set_cookies_callback, Invoke(true)).WillOnce(SetCookieAction(
+      &cookie_monster(), url_google_, "X=Y", &set_cookies_callback));
+  EXPECT_CALL(set_cookies_callback, Invoke(true))
+      .WillOnce(QuitCurrentMessageLoop());
 
   CompleteLoadingAndWait();
 }
 
 TEST_F(DeferredCookieTaskTest, DeferredDeleteCookie) {
   MockClosure delete_cookie_callback;
 
-  BeginWithForDomainKey("google.izzle", DeleteCookieAction(
-      &cookie_monster(), url_google_, "A", &delete_cookie_callback));
+  BeginWithForDomainKey(
+      "google.izzle",
+      DeleteCookieAction(
+          &cookie_monster(), url_google_, "A", &delete_cookie_callback));
 
   WaitForLoadCall();
 
-  EXPECT_CALL(delete_cookie_callback, Invoke()).WillOnce(
-      DeleteCookieAction(
-          &cookie_monster(), url_google_, "X", &delete_cookie_callback));
-  EXPECT_CALL(delete_cookie_callback, Invoke()).WillOnce(
-      QuitCurrentMessageLoop());
+  EXPECT_CALL(delete_cookie_callback, Invoke()).WillOnce(DeleteCookieAction(
+      &cookie_monster(), url_google_, "X", &delete_cookie_callback));
+  EXPECT_CALL(delete_cookie_callback, Invoke())
+      .WillOnce(QuitCurrentMessageLoop());
 
   CompleteLoadingAndWait();
 }
 
 TEST_F(DeferredCookieTaskTest, DeferredSetCookieWithDetails) {
   MockSetCookiesCallback set_cookies_callback;
 
   CookiesInputInfo cookie_info = {
-    url_google_foo_, "A", "B", std::string(), "/foo",
-    base::Time(), false, false, COOKIE_PRIORITY_DEFAULT
-  };
-  BeginWithForDomainKey("google.izzle", SetCookieWithDetailsAction(
-      &cookie_monster(), cookie_info, &set_cookies_callback));
+      url_google_foo_, "A",   "B",   std::string(),          "/foo",
+      base::Time(),    false, false, COOKIE_PRIORITY_DEFAULT};
+  BeginWithForDomainKey(
+      "google.izzle",
+      SetCookieWithDetailsAction(
+          &cookie_monster(), cookie_info, &set_cookies_callback));
 
   WaitForLoadCall();
 
   CookiesInputInfo cookie_info_exp = {
-    url_google_foo_, "A", "B", std::string(), "/foo",
-    base::Time(), false, false, COOKIE_PRIORITY_DEFAULT
-  };
-  EXPECT_CALL(set_cookies_callback, Invoke(true)).WillOnce(
-      SetCookieWithDetailsAction(
+      url_google_foo_, "A",   "B",   std::string(),          "/foo",
+      base::Time(),    false, false, COOKIE_PRIORITY_DEFAULT};
+  EXPECT_CALL(set_cookies_callback, Invoke(true))
+      .WillOnce(SetCookieWithDetailsAction(
           &cookie_monster(), cookie_info_exp, &set_cookies_callback));
-  EXPECT_CALL(set_cookies_callback, Invoke(true)).WillOnce(
-      QuitCurrentMessageLoop());
+  EXPECT_CALL(set_cookies_callback, Invoke(true))
+      .WillOnce(QuitCurrentMessageLoop());
 
   CompleteLoadingAndWait();
 }
 
 TEST_F(DeferredCookieTaskTest, DeferredGetAllCookies) {
   DeclareLoadedCookie("www.google.izzle",
                       "X=1; path=/; expires=Mon, 18-Apr-22 22:50:14 GMT",
                       Time::Now() + TimeDelta::FromDays(3));
 
   MockGetCookieListCallback get_cookie_list_callback;
 
-  BeginWith(GetAllCookiesAction(
-      &cookie_monster(), &get_cookie_list_callback));
+  BeginWith(GetAllCookiesAction(&cookie_monster(), &get_cookie_list_callback));
 
   WaitForLoadCall();
 
   EXPECT_CALL(get_cookie_list_callback, Invoke(testing::_)).WillOnce(
       GetAllCookiesAction(&cookie_monster(), &get_cookie_list_callback));
-  EXPECT_CALL(get_cookie_list_callback, Invoke(testing::_)).WillOnce(
-      QuitCurrentMessageLoop());
+  EXPECT_CALL(get_cookie_list_callback, Invoke(testing::_))
+      .WillOnce(QuitCurrentMessageLoop());
 
   CompleteLoadingAndWait();
 }
 
 TEST_F(DeferredCookieTaskTest, DeferredGetAllForUrlCookies) {
   DeclareLoadedCookie("www.google.izzle",
                       "X=1; path=/; expires=Mon, 18-Apr-22 22:50:14 GMT",
                       Time::Now() + TimeDelta::FromDays(3));
 
   MockGetCookieListCallback get_cookie_list_callback;
 
-  BeginWithForDomainKey("google.izzle", GetAllCookiesForUrlAction(
-      &cookie_monster(), url_google_, &get_cookie_list_callback));
+  BeginWithForDomainKey(
+      "google.izzle",
+      GetAllCookiesForUrlAction(
+          &cookie_monster(), url_google_, &get_cookie_list_callback));
 
   WaitForLoadCall();
 
-  EXPECT_CALL(get_cookie_list_callback, Invoke(testing::_)).WillOnce(
-      GetAllCookiesForUrlAction(
+  EXPECT_CALL(get_cookie_list_callback, Invoke(testing::_))
+      .WillOnce(GetAllCookiesForUrlAction(
           &cookie_monster(), url_google_, &get_cookie_list_callback));
-  EXPECT_CALL(get_cookie_list_callback, Invoke(testing::_)).WillOnce(
-      QuitCurrentMessageLoop());
+  EXPECT_CALL(get_cookie_list_callback, Invoke(testing::_))
+      .WillOnce(QuitCurrentMessageLoop());
 
   CompleteLoadingAndWait();
 }
 
 TEST_F(DeferredCookieTaskTest, DeferredGetAllForUrlWithOptionsCookies) {
   DeclareLoadedCookie("www.google.izzle",
                       "X=1; path=/; expires=Mon, 18-Apr-22 22:50:14 GMT",
                       Time::Now() + TimeDelta::FromDays(3));
 
   MockGetCookieListCallback get_cookie_list_callback;
 
-  BeginWithForDomainKey("google.izzle", GetAllCookiesForUrlWithOptionsAction(
-      &cookie_monster(), url_google_, &get_cookie_list_callback));
+  BeginWithForDomainKey(
+      "google.izzle",
+      GetAllCookiesForUrlWithOptionsAction(
+          &cookie_monster(), url_google_, &get_cookie_list_callback));
 
   WaitForLoadCall();
 
-  EXPECT_CALL(get_cookie_list_callback, Invoke(testing::_)).WillOnce(
-      GetAllCookiesForUrlWithOptionsAction(
+  EXPECT_CALL(get_cookie_list_callback, Invoke(testing::_))
+      .WillOnce(GetAllCookiesForUrlWithOptionsAction(
           &cookie_monster(), url_google_, &get_cookie_list_callback));
-  EXPECT_CALL(get_cookie_list_callback, Invoke(testing::_)).WillOnce(
-      QuitCurrentMessageLoop());
+  EXPECT_CALL(get_cookie_list_callback, Invoke(testing::_))
+      .WillOnce(QuitCurrentMessageLoop());
 
   CompleteLoadingAndWait();
 }
 
 TEST_F(DeferredCookieTaskTest, DeferredDeleteAllCookies) {
   MockDeleteCallback delete_callback;
 
-  BeginWith(DeleteAllAction(
-      &cookie_monster(), &delete_callback));
+  BeginWith(DeleteAllAction(&cookie_monster(), &delete_callback));
 
   WaitForLoadCall();
 
-  EXPECT_CALL(delete_callback, Invoke(false)).WillOnce(
-      DeleteAllAction(&cookie_monster(), &delete_callback));
-  EXPECT_CALL(delete_callback, Invoke(false)).WillOnce(
-      QuitCurrentMessageLoop());
+  EXPECT_CALL(delete_callback, Invoke(false))
+      .WillOnce(DeleteAllAction(&cookie_monster(), &delete_callback));
+  EXPECT_CALL(delete_callback, Invoke(false))
+      .WillOnce(QuitCurrentMessageLoop());
 
   CompleteLoadingAndWait();
 }
 
 TEST_F(DeferredCookieTaskTest, DeferredDeleteAllCreatedBetweenCookies) {
   MockDeleteCallback delete_callback;
 
   BeginWith(DeleteAllCreatedBetweenAction(
       &cookie_monster(), base::Time(), base::Time::Now(), &delete_callback));
 
   WaitForLoadCall();
 
-  EXPECT_CALL(delete_callback, Invoke(false)).WillOnce(
-      DeleteAllCreatedBetweenAction(
-          &cookie_monster(), base::Time(), base::Time::Now(),
-          &delete_callback));
-  EXPECT_CALL(delete_callback, Invoke(false)).WillOnce(
-      QuitCurrentMessageLoop());
+  EXPECT_CALL(delete_callback, Invoke(false))
+      .WillOnce(DeleteAllCreatedBetweenAction(&cookie_monster(),
+                                              base::Time(),
+                                              base::Time::Now(),
+                                              &delete_callback));
+  EXPECT_CALL(delete_callback, Invoke(false))
+      .WillOnce(QuitCurrentMessageLoop());
 
   CompleteLoadingAndWait();
 }
 
 TEST_F(DeferredCookieTaskTest, DeferredDeleteAllForHostCookies) {
   MockDeleteCallback delete_callback;
 
-  BeginWithForDomainKey("google.izzle", DeleteAllForHostAction(
-      &cookie_monster(), url_google_, &delete_callback));
+  BeginWithForDomainKey(
+      "google.izzle",
+      DeleteAllForHostAction(&cookie_monster(), url_google_, &delete_callback));
 
   WaitForLoadCall();
 
   EXPECT_CALL(delete_callback, Invoke(false)).WillOnce(
-      DeleteAllForHostAction(
-          &cookie_monster(), url_google_, &delete_callback));
-  EXPECT_CALL(delete_callback, Invoke(false)).WillOnce(
-      QuitCurrentMessageLoop());
+      DeleteAllForHostAction(&cookie_monster(), url_google_, &delete_callback));
+  EXPECT_CALL(delete_callback, Invoke(false))
+      .WillOnce(QuitCurrentMessageLoop());
 
   CompleteLoadingAndWait();
 }
 
 TEST_F(DeferredCookieTaskTest, DeferredDeleteCanonicalCookie) {
   std::vector<CanonicalCookie*> cookies;
-  CanonicalCookie cookie = BuildCanonicalCookie(
-      "www.google.com", "X=1; path=/", base::Time::Now());
+  CanonicalCookie cookie =
+      BuildCanonicalCookie("www.google.com", "X=1; path=/", base::Time::Now());
 
   MockDeleteCookieCallback delete_cookie_callback;
 
   BeginWith(DeleteCanonicalCookieAction(
       &cookie_monster(), cookie, &delete_cookie_callback));
 
   WaitForLoadCall();
 
-  EXPECT_CALL(delete_cookie_callback, Invoke(false)).WillOnce(
-      DeleteCanonicalCookieAction(
-      &cookie_monster(), cookie, &delete_cookie_callback));
-  EXPECT_CALL(delete_cookie_callback, Invoke(false)).WillOnce(
-      QuitCurrentMessageLoop());
+  EXPECT_CALL(delete_cookie_callback, Invoke(false))
+      .WillOnce(DeleteCanonicalCookieAction(
+          &cookie_monster(), cookie, &delete_cookie_callback));
+  EXPECT_CALL(delete_cookie_callback, Invoke(false))
+      .WillOnce(QuitCurrentMessageLoop());
 
   CompleteLoadingAndWait();
 }
 
 TEST_F(DeferredCookieTaskTest, DeferredDeleteSessionCookies) {
   MockDeleteCallback delete_callback;
 
-  BeginWith(DeleteSessionCookiesAction(
-      &cookie_monster(), &delete_callback));
+  BeginWith(DeleteSessionCookiesAction(&cookie_monster(), &delete_callback));
 
   WaitForLoadCall();
 
   EXPECT_CALL(delete_callback, Invoke(false)).WillOnce(
       DeleteSessionCookiesAction(&cookie_monster(), &delete_callback));
-  EXPECT_CALL(delete_callback, Invoke(false)).WillOnce(
-      QuitCurrentMessageLoop());
+  EXPECT_CALL(delete_callback, Invoke(false))
+      .WillOnce(QuitCurrentMessageLoop());
 
   CompleteLoadingAndWait();
 }
 
 // Verify that a series of queued tasks are executed in order upon loading of
 // the backing store and that new tasks received while the queued tasks are
 // being dispatched go to the end of the queue.
 TEST_F(DeferredCookieTaskTest, DeferredTaskOrder) {
   DeclareLoadedCookie("www.google.izzle",
                       "X=1; path=/; expires=Mon, 18-Apr-22 22:50:14 GMT",
                       Time::Now() + TimeDelta::FromDays(3));
 
   MockGetCookiesCallback get_cookies_callback;
   MockSetCookiesCallback set_cookies_callback;
   MockGetCookiesCallback get_cookies_callback_deferred;
 
   EXPECT_CALL(*this, Begin()).WillOnce(testing::DoAll(
-      GetCookiesAction(
-          &cookie_monster(), url_google_, &get_cookies_callback),
+      GetCookiesAction(&cookie_monster(), url_google_, &get_cookies_callback),
       SetCookieAction(
           &cookie_monster(), url_google_, "A=B", &set_cookies_callback)));
   ExpectLoadCall();
   ExpectLoadForKeyCall("google.izzle", false);
   Begin();
 
   WaitForLoadCall();
-  EXPECT_CALL(get_cookies_callback, Invoke("X=1")).WillOnce(
-      GetCookiesAction(
-          &cookie_monster(), url_google_, &get_cookies_callback_deferred));
+  EXPECT_CALL(get_cookies_callback, Invoke("X=1")).WillOnce(GetCookiesAction(
+      &cookie_monster(), url_google_, &get_cookies_callback_deferred));
   EXPECT_CALL(set_cookies_callback, Invoke(true));
-  EXPECT_CALL(get_cookies_callback_deferred, Invoke("A=B; X=1")).WillOnce(
-      QuitCurrentMessageLoop());
+  EXPECT_CALL(get_cookies_callback_deferred, Invoke("A=B; X=1"))
+      .WillOnce(QuitCurrentMessageLoop());
 
   CompleteLoadingAndWait();
 }
 
 TEST_F(CookieMonsterTest, TestCookieDeleteAll) {
-  scoped_refptr<MockPersistentCookieStore> store(
-      new MockPersistentCookieStore);
+  scoped_refptr<MockPersistentCookieStore> store(new MockPersistentCookieStore);
   scoped_refptr<CookieMonster> cm(new CookieMonster(store.get(), NULL));
   CookieOptions options;
   options.set_include_httponly();
 
   EXPECT_TRUE(SetCookie(cm.get(), url_google_, kValidCookieLine));
   EXPECT_EQ("A=B", GetCookies(cm.get(), url_google_));
 
   EXPECT_TRUE(
       SetCookieWithOptions(cm.get(), url_google_, "C=D; httponly", options));
   EXPECT_EQ("A=B; C=D", GetCookiesWithOptions(cm.get(), url_google_, options));
@@ skipping 21 matching lines @@
   scoped_refptr<CookieMonster> cm(new CookieMonster(NULL, NULL));
   Time now = Time::Now();
 
   // Nothing has been added so nothing should be deleted.
   EXPECT_EQ(
       0,
       DeleteAllCreatedBetween(cm.get(), now - TimeDelta::FromDays(99), Time()));
 
   // Create 3 cookies with creation date of today, yesterday and the day before.
   EXPECT_TRUE(cm->SetCookieWithCreationTime(url_google_, "T-0=Now", now));
-  EXPECT_TRUE(cm->SetCookieWithCreationTime(url_google_, "T-1=Yesterday",
-                                            now - TimeDelta::FromDays(1)));
-  EXPECT_TRUE(cm->SetCookieWithCreationTime(url_google_, "T-2=DayBefore",
-                                            now - TimeDelta::FromDays(2)));
-  EXPECT_TRUE(cm->SetCookieWithCreationTime(url_google_, "T-3=ThreeDays",
-                                            now - TimeDelta::FromDays(3)));
-  EXPECT_TRUE(cm->SetCookieWithCreationTime(url_google_, "T-7=LastWeek",
-                                            now - TimeDelta::FromDays(7)));
+  EXPECT_TRUE(cm->SetCookieWithCreationTime(
+      url_google_, "T-1=Yesterday", now - TimeDelta::FromDays(1)));
+  EXPECT_TRUE(cm->SetCookieWithCreationTime(
+      url_google_, "T-2=DayBefore", now - TimeDelta::FromDays(2)));
+  EXPECT_TRUE(cm->SetCookieWithCreationTime(
+      url_google_, "T-3=ThreeDays", now - TimeDelta::FromDays(3)));
+  EXPECT_TRUE(cm->SetCookieWithCreationTime(
+      url_google_, "T-7=LastWeek", now - TimeDelta::FromDays(7)));
 
   // Try to delete threedays and the daybefore.
   EXPECT_EQ(2,
             DeleteAllCreatedBetween(cm.get(),
                                     now - TimeDelta::FromDays(3),
                                     now - TimeDelta::FromDays(1)));
 
   // Try to delete yesterday, also make sure that delete_end is not
   // inclusive.
   EXPECT_EQ(
@@ skipping 185 matching lines @@
   EXPECT_TRUE(SetCookie(cm.get(), url_google_, "A=A3; path=/bar"));
   EXPECT_TRUE(SetCookie(cm.get(), url_google_, "B=B1; path=/"));
   EXPECT_TRUE(SetCookie(cm.get(), url_google_, "B=B2; path=/foo"));
   EXPECT_TRUE(SetCookie(cm.get(), url_google_, "B=B3; path=/bar"));
 
   DeleteCookie(cm.get(), GURL(std::string(kUrlGoogle) + "/foo/bar"), "A");
 
   CookieList cookies = GetAllCookies(cm.get());
   size_t expected_size = 4;
   EXPECT_EQ(expected_size, cookies.size());
-  for (CookieList::iterator it = cookies.begin();
-       it != cookies.end(); ++it) {
+  for (CookieList::iterator it = cookies.begin(); it != cookies.end(); ++it) {
     EXPECT_NE("A1", it->Value());
     EXPECT_NE("A2", it->Value());
   }
 }
 
 TEST_F(CookieMonsterTest, InitializeFromCookieMonster) {
   scoped_refptr<CookieMonster> cm_1(new CookieMonster(NULL, NULL));
   CookieOptions options;
 
-  EXPECT_TRUE(SetCookieWithOptions(cm_1.get(), url_google_foo_,
-                                               "A1=B; path=/foo;",
-                                               options));
-  EXPECT_TRUE(SetCookieWithOptions(cm_1.get(), url_google_bar_,
-                                               "A2=D; path=/bar;",
-                                               options));
-  EXPECT_TRUE(SetCookieWithOptions(cm_1.get(), url_google_,
-                                               "A3=F;",
-                                               options));
+  EXPECT_TRUE(SetCookieWithOptions(
+      cm_1.get(), url_google_foo_, "A1=B; path=/foo;", options));
+  EXPECT_TRUE(SetCookieWithOptions(
+      cm_1.get(), url_google_bar_, "A2=D; path=/bar;", options));
+  EXPECT_TRUE(SetCookieWithOptions(cm_1.get(), url_google_, "A3=F;", options));
 
   CookieList cookies_1 = GetAllCookies(cm_1.get());
   scoped_refptr<CookieMonster> cm_2(new CookieMonster(NULL, NULL));
   ASSERT_TRUE(cm_2->InitializeFrom(cookies_1));
   CookieList cookies_2 = GetAllCookies(cm_2.get());
 
   size_t expected_size = 3;
   EXPECT_EQ(expected_size, cookies_2.size());
 
   CookieList::iterator it = cookies_2.begin();
@@ skipping 10 matching lines @@
   EXPECT_EQ("A3", it->Name());
   EXPECT_EQ("/", it->Path());
 }
 
 // Tests importing from a persistent cookie store that contains duplicate
 // equivalent cookies. This situation should be handled by removing the
 // duplicate cookie (both from the in-memory cache, and from the backing store).
 //
 // This is a regression test for: http://crbug.com/17855.
 TEST_F(CookieMonsterTest, DontImportDuplicateCookies) {
-  scoped_refptr<MockPersistentCookieStore> store(
-      new MockPersistentCookieStore);
+  scoped_refptr<MockPersistentCookieStore> store(new MockPersistentCookieStore);
 
   // We will fill some initial cookies into the PersistentCookieStore,
   // to simulate a database with 4 duplicates.  Note that we need to
   // be careful not to have any duplicate creation times at all (as it's a
   // violation of a CookieMonster invariant) even if Time::Now() doesn't
   // move between calls.
   std::vector<CanonicalCookie*> initial_cookies;
 
   // Insert 4 cookies with name "X" on path "/", with varying creation
   // dates. We expect only the most recent one to be preserved following
@@ skipping 61 matching lines @@
   EXPECT_EQ(CookieStoreCommand::REMOVE, store->commands()[2].type);
   EXPECT_EQ(CookieStoreCommand::REMOVE, store->commands()[3].type);
 }
 
 // Tests importing from a persistent cookie store that contains cookies
 // with duplicate creation times.  This situation should be handled by
 // dropping the cookies before insertion/visibility to user.
 //
 // This is a regression test for: http://crbug.com/43188.
 TEST_F(CookieMonsterTest, DontImportDuplicateCreationTimes) {
-  scoped_refptr<MockPersistentCookieStore> store(
-      new MockPersistentCookieStore);
+  scoped_refptr<MockPersistentCookieStore> store(new MockPersistentCookieStore);
 
   Time now(Time::Now());
   Time earlier(now - TimeDelta::FromDays(1));
 
   // Insert 8 cookies, four with the current time as creation times, and
   // four with the earlier time as creation times.  We should only get
   // two cookies remaining, but which two (other than that there should
   // be one from each set) will be random.
   std::vector<CanonicalCookie*> initial_cookies;
   AddCookieToList("www.google.com", "X=1; path=/", now, &initial_cookies);
@@ skipping 15 matching lines @@
   EXPECT_EQ(2U, list.size());
   // Confirm that we have one of each.
   std::string name1(list[0].Name());
   std::string name2(list[1].Name());
   EXPECT_TRUE(name1 == "X" || name2 == "X");
   EXPECT_TRUE(name1 == "Y" || name2 == "Y");
   EXPECT_NE(name1, name2);
 }
 
 TEST_F(CookieMonsterTest, CookieMonsterDelegate) {
-  scoped_refptr<MockPersistentCookieStore> store(
-      new MockPersistentCookieStore);
+  scoped_refptr<MockPersistentCookieStore> store(new MockPersistentCookieStore);
   scoped_refptr<MockCookieMonsterDelegate> delegate(
       new MockCookieMonsterDelegate);
   scoped_refptr<CookieMonster> cm(
       new CookieMonster(store.get(), delegate.get()));
 
   EXPECT_TRUE(SetCookie(cm.get(), url_google_, "A=B"));
   EXPECT_TRUE(SetCookie(cm.get(), url_google_, "C=D"));
   EXPECT_TRUE(SetCookie(cm.get(), url_google_, "E=F"));
   EXPECT_EQ("A=B; C=D; E=F", GetCookies(cm.get(), url_google_));
   ASSERT_EQ(3u, delegate->changes().size());
@@ skipping 200 matching lines @@
   // the http_only cookie, the host secure cookie, and the two host
   // path cookies.  http_only, secure, and paths are ignored by
   // this call, and domain cookies arent touched.
   PopulateCmForDeleteAllForHost(cm);
   EXPECT_EQ("dom_1=X; dom_2=X; dom_3=X; host_3=X",
             GetCookies(cm.get(), GURL(kTopLevelDomainPlus3)));
   EXPECT_EQ("dom_1=X; dom_2=X; host_2=X; sec_dom=X; sec_host=X",
             GetCookies(cm.get(), GURL(kTopLevelDomainPlus2Secure)));
   EXPECT_EQ("dom_1=X; host_1=X",
             GetCookies(cm.get(), GURL(kTopLevelDomainPlus1)));
-  EXPECT_EQ("dom_path_2=X; host_path_2=X; dom_path_1=X; host_path_1=X; "
-            "dom_1=X; dom_2=X; host_2=X; sec_dom=X; sec_host=X",
-            GetCookies(cm.get(),
-                       GURL(kTopLevelDomainPlus2Secure +
-                            std::string("/dir1/dir2/xxx"))));
+  EXPECT_EQ(
+      "dom_path_2=X; host_path_2=X; dom_path_1=X; host_path_1=X; "
+      "dom_1=X; dom_2=X; host_2=X; sec_dom=X; sec_host=X",
+      GetCookies(
+          cm.get(),
+          GURL(kTopLevelDomainPlus2Secure + std::string("/dir1/dir2/xxx"))));
 
   EXPECT_EQ(5, DeleteAllForHost(cm.get(), GURL(kTopLevelDomainPlus2)));
   EXPECT_EQ(8U, GetAllCookies(cm.get()).size());
 
   EXPECT_EQ("dom_1=X; dom_2=X; dom_3=X; host_3=X",
             GetCookies(cm.get(), GURL(kTopLevelDomainPlus3)));
   EXPECT_EQ("dom_1=X; dom_2=X; sec_dom=X",
             GetCookies(cm.get(), GURL(kTopLevelDomainPlus2Secure)));
   EXPECT_EQ("dom_1=X; host_1=X",
             GetCookies(cm.get(), GURL(kTopLevelDomainPlus1)));
@@ skipping 90 matching lines @@
                        Time(),
                        false,
                        false,
                        COOKIE_PRIORITY_DEFAULT);
 
   // Now we check
   CookieList cookie_list(GetAllCookies(cm.get()));
   typedef std::map<int64, CanonicalCookie> TimeCookieMap;
   TimeCookieMap check_map;
   for (CookieList::const_iterator it = cookie_list.begin();
-       it != cookie_list.end(); it++) {
+       it != cookie_list.end();
+       it++) {
     const int64 creation_date = it->CreationDate().ToInternalValue();
-    TimeCookieMap::const_iterator
-        existing_cookie_it(check_map.find(creation_date));
+    TimeCookieMap::const_iterator existing_cookie_it(
+        check_map.find(creation_date));
     EXPECT_TRUE(existing_cookie_it == check_map.end())
         << "Cookie " << it->Name() << " has same creation date ("
         << it->CreationDate().ToInternalValue()
         << ") as previously entered cookie "
         << existing_cookie_it->second.Name();
 
     if (existing_cookie_it == check_map.end()) {
-      check_map.insert(TimeCookieMap::value_type(
-          it->CreationDate().ToInternalValue(), *it));
+      check_map.insert(
+          TimeCookieMap::value_type(it->CreationDate().ToInternalValue(), *it));
     }
   }
 }
 
 // Mainly a test of GetEffectiveDomain, or more specifically, of the
 // expected behavior of GetEffectiveDomain within the CookieMonster.
 TEST_F(CookieMonsterTest, GetKey) {
   scoped_refptr<CookieMonster> cm(new CookieMonster(NULL, NULL));
 
   // This test is really only interesting if GetKey() actually does something.
@@ skipping 19 matching lines @@
 TEST_F(CookieMonsterTest, BackingStoreCommunication) {
   // Store details for cookies transforming through the backing store interface.
 
   base::Time current(base::Time::Now());
   scoped_refptr<MockSimplePersistentCookieStore> store(
       new MockSimplePersistentCookieStore);
   base::Time new_access_time;
   base::Time expires(base::Time::Now() + base::TimeDelta::FromSeconds(100));
 
   const CookiesInputInfo input_info[] = {
-    {GURL("http://a.b.google.com"), "a", "1", "", "/path/to/cookie", expires,
-     false, false, COOKIE_PRIORITY_DEFAULT},
-    {GURL("https://www.google.com"), "b", "2", ".google.com",
-     "/path/from/cookie", expires + TimeDelta::FromSeconds(10),
-     true, true, COOKIE_PRIORITY_DEFAULT},
-    {GURL("https://google.com"), "c", "3", "", "/another/path/to/cookie",
-     base::Time::Now() + base::TimeDelta::FromSeconds(100),
-     true, false, COOKIE_PRIORITY_DEFAULT}
-  };
+      {GURL("http://a.b.google.com"), "a", "1", "", "/path/to/cookie", expires,
+       false, false, COOKIE_PRIORITY_DEFAULT},
+      {GURL("https://www.google.com"), "b", "2", ".google.com",
+       "/path/from/cookie", expires + TimeDelta::FromSeconds(10), true, true,
+       COOKIE_PRIORITY_DEFAULT},
+      {GURL("https://google.com"), "c", "3", "", "/another/path/to/cookie",
+       base::Time::Now() + base::TimeDelta::FromSeconds(100), true, false,
+       COOKIE_PRIORITY_DEFAULT}};
   const int INPUT_DELETE = 1;
 
   // Create new cookies and flush them to the store.
   {
     scoped_refptr<CookieMonster> cmout(new CookieMonster(store.get(), NULL));
     for (const CookiesInputInfo* p = input_info;
          p < &input_info[ARRAYSIZE_UNSAFE(input_info)];
          p++) {
       EXPECT_TRUE(SetCookieWithDetails(cmout.get(),
                                        p->url,
                                        p->name,
                                        p->value,
                                        p->domain,
                                        p->path,
                                        p->expiration_time,
                                        p->secure,
                                        p->http_only,
                                        p->priority));
     }
-    GURL del_url(input_info[INPUT_DELETE].url.Resolve(
-                     input_info[INPUT_DELETE].path).spec());
+    GURL del_url(input_info[INPUT_DELETE]
+                     .url.Resolve(input_info[INPUT_DELETE].path)
+                     .spec());
     DeleteCookie(cmout.get(), del_url, input_info[INPUT_DELETE].name);
   }
 
   // Create a new cookie monster and make sure that everything is correct
   {
     scoped_refptr<CookieMonster> cmin(new CookieMonster(store.get(), NULL));
     CookieList cookies(GetAllCookies(cmin.get()));
     ASSERT_EQ(2u, cookies.size());
     // Ordering is path length, then creation time.  So second cookie
     // will come first, and we need to swap them.
@@ skipping 91 matching lines @@
   // Now we explore a series of relationships between cookie last access
   // time and size of store to make sure we only get rid of cookies when
   // we really should.
   const struct TestCase {
     size_t num_cookies;
     size_t num_old_cookies;
     size_t expected_initial_cookies;
     // Indexed by ExpiryAndKeyScheme
     size_t expected_cookies_after_set;
   } test_cases[] = {
-    {
-      // A whole lot of recent cookies; gc shouldn't happen.
-      CookieMonster::kMaxCookies * 2,
-      0,
-      CookieMonster::kMaxCookies * 2,
-      CookieMonster::kMaxCookies * 2 + 1
-    }, {
-      // Some old cookies, but still overflowing max.
-      CookieMonster::kMaxCookies * 2,
-      CookieMonster::kMaxCookies / 2,
-      CookieMonster::kMaxCookies * 2,
-      CookieMonster::kMaxCookies * 2 - CookieMonster::kMaxCookies / 2 + 1
-    }, {
-      // Old cookies enough to bring us right down to our purge line.
-      CookieMonster::kMaxCookies * 2,
-      CookieMonster::kMaxCookies + CookieMonster::kPurgeCookies + 1,
-      CookieMonster::kMaxCookies * 2,
-      CookieMonster::kMaxCookies - CookieMonster::kPurgeCookies
-    }, {
-      // Old cookies enough to bring below our purge line (which we
-      // shouldn't do).
-      CookieMonster::kMaxCookies * 2,
-      CookieMonster::kMaxCookies * 3 / 2,
-      CookieMonster::kMaxCookies * 2,
-      CookieMonster::kMaxCookies - CookieMonster::kPurgeCookies
-    }
-  };
+        {// A whole lot of recent cookies; gc shouldn't happen.
+         CookieMonster::kMaxCookies * 2, 0, CookieMonster::kMaxCookies * 2,
+         CookieMonster::kMaxCookies * 2 + 1},
+        {// Some old cookies, but still overflowing max.
+         CookieMonster::kMaxCookies * 2, CookieMonster::kMaxCookies / 2,
+         CookieMonster::kMaxCookies * 2,
+         CookieMonster::kMaxCookies * 2 - CookieMonster::kMaxCookies / 2 + 1},
+        {// Old cookies enough to bring us right down to our purge line.
+         CookieMonster::kMaxCookies * 2,
+         CookieMonster::kMaxCookies + CookieMonster::kPurgeCookies + 1,
+         CookieMonster::kMaxCookies * 2,
+         CookieMonster::kMaxCookies - CookieMonster::kPurgeCookies},
+        {// Old cookies enough to bring below our purge line (which we
+         // shouldn't do).
+         CookieMonster::kMaxCookies * 2, CookieMonster::kMaxCookies * 3 / 2,
+         CookieMonster::kMaxCookies * 2,
+         CookieMonster::kMaxCookies - CookieMonster::kPurgeCookies}};
 
   for (int ci = 0; ci < static_cast<int>(ARRAYSIZE_UNSAFE(test_cases)); ++ci) {
-    const TestCase *test_case = &test_cases[ci];
-    scoped_refptr<CookieMonster> cm(
-        CreateMonsterFromStoreForGC(
-            test_case->num_cookies, test_case->num_old_cookies,
-            CookieMonster::kSafeFromGlobalPurgeDays * 2));
+    const TestCase* test_case = &test_cases[ci];
+    scoped_refptr<CookieMonster> cm(CreateMonsterFromStoreForGC(
+        test_case->num_cookies,
+        test_case->num_old_cookies,
+        CookieMonster::kSafeFromGlobalPurgeDays * 2));
     EXPECT_EQ(test_case->expected_initial_cookies,
-              GetAllCookies(cm.get()).size()) << "For test case " << ci;
+              GetAllCookies(cm.get()).size())
+        << "For test case " << ci;
     // Will trigger GC
     SetCookie(cm.get(), GURL("http://newdomain.com"), "b=2");
     EXPECT_EQ(test_case->expected_cookies_after_set,
-              GetAllCookies(cm.get()).size()) << "For test case " << ci;
+              GetAllCookies(cm.get()).size())
+        << "For test case " << ci;
   }
 }
 
 // This test checks that keep expired cookies flag is working.
 TEST_F(CookieMonsterTest, KeepExpiredCookies) {
   scoped_refptr<CookieMonster> cm(new CookieMonster(NULL, NULL));
   cm->SetKeepExpiredCookies();
   CookieOptions options;
 
   // Set a persistent cookie.
@@ skipping 46 matching lines @@
   virtual void UpdateCookieAccessTime(const CanonicalCookie&) OVERRIDE {}
   virtual void DeleteCookie(const CanonicalCookie&) OVERRIDE {}
   virtual void SetForceKeepSessionState() OVERRIDE {}
 
   virtual void Flush(const base::Closure& callback) OVERRIDE {
     ++flush_count_;
     if (!callback.is_null())
       callback.Run();
   }
 
-  int flush_count() {
-    return flush_count_;
-  }
+  int flush_count() { return flush_count_; }
 
  private:
   virtual ~FlushablePersistentStore() {}
 
   volatile int flush_count_;
 };
 
 // Counts the number of times Callback() has been run.
 class CallbackCounter : public base::RefCountedThreadSafe<CallbackCounter> {
  public:
   CallbackCounter() : callback_count_(0) {}
 
-  void Callback() {
-    ++callback_count_;
-  }
+  void Callback() { ++callback_count_; }
 
-  int callback_count() {
-    return callback_count_;
-  }
+  int callback_count() { return callback_count_; }
 
  private:
   friend class base::RefCountedThreadSafe<CallbackCounter>;
   ~CallbackCounter() {}
 
   volatile int callback_count_;
 };
 
 }  // namespace
 
@@ skipping 48 matching lines @@
 
   ASSERT_EQ(3, counter->callback_count());
 }
 
 TEST_F(CookieMonsterTest, HistogramCheck) {
   scoped_refptr<CookieMonster> cm(new CookieMonster(NULL, NULL));
   // Should match call in InitializeHistograms, but doesn't really matter
   // since the histogram should have been initialized by the CM construction
   // above.
   base::HistogramBase* expired_histogram =
-      base::Histogram::FactoryGet(
-          "Cookie.ExpirationDurationMinutes", 1, 10 * 365 * 24 * 60, 50,
-          base::Histogram::kUmaTargetedHistogramFlag);
+      base::Histogram::FactoryGet("Cookie.ExpirationDurationMinutes",
+                                  1,
+                                  10 * 365 * 24 * 60,
+                                  50,
+                                  base::Histogram::kUmaTargetedHistogramFlag);
 
   scoped_ptr<base::HistogramSamples> samples1(
       expired_histogram->SnapshotSamples());
   ASSERT_TRUE(
       SetCookieWithDetails(cm.get(),
                            GURL("http://fake.a.url"),
                            "a",
                            "b",
                            "a.url",
                            "/",
@@ skipping 16 matching lines @@
 
 namespace {
 
 class MultiThreadedCookieMonsterTest : public CookieMonsterTest {
  public:
   MultiThreadedCookieMonsterTest() : other_thread_("CMTthread") {}
 
   // Helper methods for calling the asynchronous CookieMonster methods
   // from a different thread.
 
-  void GetAllCookiesTask(CookieMonster* cm,
-                         GetCookieListCallback* callback) {
+  void GetAllCookiesTask(CookieMonster* cm, GetCookieListCallback* callback) {
     cm->GetAllCookiesAsync(
         base::Bind(&GetCookieListCallback::Run, base::Unretained(callback)));
   }
 
   void GetAllCookiesForURLTask(CookieMonster* cm,
                                const GURL& url,
                                GetCookieListCallback* callback) {
     cm->GetAllCookiesForURLAsync(
         url,
         base::Bind(&GetCookieListCallback::Run, base::Unretained(callback)));
   }
 
   void GetAllCookiesForURLWithOptionsTask(CookieMonster* cm,
                                           const GURL& url,
                                           const CookieOptions& options,
                                           GetCookieListCallback* callback) {
     cm->GetAllCookiesForURLWithOptionsAsync(
-        url, options,
+        url,
+        options,
         base::Bind(&GetCookieListCallback::Run, base::Unretained(callback)));
   }
 
-  void SetCookieWithDetailsTask(CookieMonster* cm, const GURL& url,
+  void SetCookieWithDetailsTask(CookieMonster* cm,
+                                const GURL& url,
                                 ResultSavingCookieCallback<bool>* callback) {
     // Define the parameters here instead of in the calling fucntion.
     // The maximum number of parameters for Bind function is 6.
     std::string name = "A";
     std::string value = "B";
     std::string domain = std::string();
     std::string path = "/foo";
     base::Time expiration_time = base::Time();
     bool secure = false;
     bool http_only = false;
     CookiePriority priority = COOKIE_PRIORITY_DEFAULT;
     cm->SetCookieWithDetailsAsync(
-        url, name, value, domain, path, expiration_time, secure, http_only,
+        url,
+        name,
+        value,
+        domain,
+        path,
+        expiration_time,
+        secure,
+        http_only,
         priority,
-        base::Bind(
-            &ResultSavingCookieCallback<bool>::Run,
-            base::Unretained(callback)));
+        base::Bind(&ResultSavingCookieCallback<bool>::Run,
+                   base::Unretained(callback)));
   }
 
   void DeleteAllCreatedBetweenTask(CookieMonster* cm,
                                    const base::Time& delete_begin,
                                    const base::Time& delete_end,
                                    ResultSavingCookieCallback<int>* callback) {
     cm->DeleteAllCreatedBetweenAsync(
-        delete_begin, delete_end,
-        base::Bind(
-            &ResultSavingCookieCallback<int>::Run, base::Unretained(callback)));
+        delete_begin,
+        delete_end,
+        base::Bind(&ResultSavingCookieCallback<int>::Run,
+                   base::Unretained(callback)));
   }
 
   void DeleteAllForHostTask(CookieMonster* cm,
                             const GURL& url,
                             ResultSavingCookieCallback<int>* callback) {
-    cm->DeleteAllForHostAsync(
-        url,
-        base::Bind(
-            &ResultSavingCookieCallback<int>::Run, base::Unretained(callback)));
+    cm->DeleteAllForHostAsync(url,
+                              base::Bind(&ResultSavingCookieCallback<int>::Run,
+                                         base::Unretained(callback)));
   }
 
   void DeleteAllCreatedBetweenForHostTask(
       CookieMonster* cm,
       const base::Time delete_begin,
       const base::Time delete_end,
       const GURL& url,
       ResultSavingCookieCallback<int>* callback) {
     cm->DeleteAllCreatedBetweenForHostAsync(
-        delete_begin, delete_end, url,
-        base::Bind(
-            &ResultSavingCookieCallback<int>::Run,
-            base::Unretained(callback)));
+        delete_begin,
+        delete_end,
+        url,
+        base::Bind(&ResultSavingCookieCallback<int>::Run,
+                   base::Unretained(callback)));
   }
 
   void DeleteCanonicalCookieTask(CookieMonster* cm,
                                  const CanonicalCookie& cookie,
                                  ResultSavingCookieCallback<bool>* callback) {
     cm->DeleteCanonicalCookieAsync(
         cookie,
-        base::Bind(
-            &ResultSavingCookieCallback<bool>::Run,
-            base::Unretained(callback)));
+        base::Bind(&ResultSavingCookieCallback<bool>::Run,
+                   base::Unretained(callback)));
   }
 
  protected:
   void RunOnOtherThread(const base::Closure& task) {
     other_thread_.Start();
     other_thread_.message_loop()->PostTask(FROM_HERE, task);
     RunFor(kTimeout);
     other_thread_.Stop();
   }
 
   Thread other_thread_;
 };
 
 }  // namespace
 
 TEST_F(MultiThreadedCookieMonsterTest, ThreadCheckGetAllCookies) {
   scoped_refptr<CookieMonster> cm(new CookieMonster(NULL, NULL));
   EXPECT_TRUE(SetCookie(cm.get(), url_google_, "A=B"));
   CookieList cookies = GetAllCookies(cm.get());
   CookieList::const_iterator it = cookies.begin();
   ASSERT_TRUE(it != cookies.end());
   EXPECT_EQ("www.google.izzle", it->Domain());
   EXPECT_EQ("A", it->Name());
   ASSERT_TRUE(++it == cookies.end());
   GetCookieListCallback callback(&other_thread_);
   base::Closure task =
       base::Bind(&net::MultiThreadedCookieMonsterTest::GetAllCookiesTask,
                  base::Unretained(this),
-                 cm, &callback);
+                 cm,
+                 &callback);
   RunOnOtherThread(task);
   EXPECT_TRUE(callback.did_run());
   it = callback.cookies().begin();
   ASSERT_TRUE(it != callback.cookies().end());
   EXPECT_EQ("www.google.izzle", it->Domain());
   EXPECT_EQ("A", it->Name());
   ASSERT_TRUE(++it == callback.cookies().end());
 }
 
 TEST_F(MultiThreadedCookieMonsterTest, ThreadCheckGetAllCookiesForURL) {
   scoped_refptr<CookieMonster> cm(new CookieMonster(NULL, NULL));
   EXPECT_TRUE(SetCookie(cm.get(), url_google_, "A=B"));
   CookieList cookies = GetAllCookiesForURL(cm.get(), url_google_);
   CookieList::const_iterator it = cookies.begin();
   ASSERT_TRUE(it != cookies.end());
   EXPECT_EQ("www.google.izzle", it->Domain());
   EXPECT_EQ("A", it->Name());
   ASSERT_TRUE(++it == cookies.end());
   GetCookieListCallback callback(&other_thread_);
   base::Closure task =
       base::Bind(&net::MultiThreadedCookieMonsterTest::GetAllCookiesForURLTask,
                  base::Unretained(this),
-                 cm, url_google_, &callback);
+                 cm,
+                 url_google_,
+                 &callback);
   RunOnOtherThread(task);
   EXPECT_TRUE(callback.did_run());
   it = callback.cookies().begin();
   ASSERT_TRUE(it != callback.cookies().end());
   EXPECT_EQ("www.google.izzle", it->Domain());
   EXPECT_EQ("A", it->Name());
   ASSERT_TRUE(++it == callback.cookies().end());
 }
 
 TEST_F(MultiThreadedCookieMonsterTest, ThreadCheckGetAllCookiesForURLWithOpt) {
   scoped_refptr<CookieMonster> cm(new CookieMonster(NULL, NULL));
   EXPECT_TRUE(SetCookie(cm.get(), url_google_, "A=B"));
   CookieOptions options;
   CookieList cookies =
       GetAllCookiesForURLWithOptions(cm.get(), url_google_, options);
   CookieList::const_iterator it = cookies.begin();
   ASSERT_TRUE(it != cookies.end());
   EXPECT_EQ("www.google.izzle", it->Domain());
   EXPECT_EQ("A", it->Name());
   ASSERT_TRUE(++it == cookies.end());
   GetCookieListCallback callback(&other_thread_);
   base::Closure task = base::Bind(
       &net::MultiThreadedCookieMonsterTest::GetAllCookiesForURLWithOptionsTask,
       base::Unretained(this),
-      cm, url_google_, options, &callback);
+      cm,
+      url_google_,
+      options,
+      &callback);
   RunOnOtherThread(task);
   EXPECT_TRUE(callback.did_run());
   it = callback.cookies().begin();
   ASSERT_TRUE(it != callback.cookies().end());
   EXPECT_EQ("www.google.izzle", it->Domain());
   EXPECT_EQ("A", it->Name());
   ASSERT_TRUE(++it == callback.cookies().end());
 }
 
 TEST_F(MultiThreadedCookieMonsterTest, ThreadCheckSetCookieWithDetails) {
   scoped_refptr<CookieMonster> cm(new CookieMonster(NULL, NULL));
   EXPECT_TRUE(SetCookieWithDetails(cm.get(),
                                    url_google_foo_,
                                    "A",
                                    "B",
                                    std::string(),
                                    "/foo",
                                    base::Time(),
                                    false,
                                    false,
                                    COOKIE_PRIORITY_DEFAULT));
   ResultSavingCookieCallback<bool> callback(&other_thread_);
-  base::Closure task = base::Bind(
-      &net::MultiThreadedCookieMonsterTest::SetCookieWithDetailsTask,
-      base::Unretained(this),
-      cm, url_google_foo_, &callback);
+  base::Closure task =
+      base::Bind(&net::MultiThreadedCookieMonsterTest::SetCookieWithDetailsTask,
+                 base::Unretained(this),
+                 cm,
+                 url_google_foo_,
+                 &callback);
   RunOnOtherThread(task);
   EXPECT_TRUE(callback.did_run());
   EXPECT_TRUE(callback.result());
 }
 
 TEST_F(MultiThreadedCookieMonsterTest, ThreadCheckDeleteAllCreatedBetween) {
   scoped_refptr<CookieMonster> cm(new CookieMonster(NULL, NULL));
   CookieOptions options;
   Time now = Time::Now();
   EXPECT_TRUE(SetCookieWithOptions(cm.get(), url_google_, "A=B", options));
   EXPECT_EQ(
       1,
       DeleteAllCreatedBetween(cm.get(), now - TimeDelta::FromDays(99), Time()));
   EXPECT_TRUE(SetCookieWithOptions(cm.get(), url_google_, "A=B", options));
   ResultSavingCookieCallback<int> callback(&other_thread_);
   base::Closure task = base::Bind(
       &net::MultiThreadedCookieMonsterTest::DeleteAllCreatedBetweenTask,
       base::Unretained(this),
-      cm, now - TimeDelta::FromDays(99),
-      Time(), &callback);
+      cm,
+      now - TimeDelta::FromDays(99),
+      Time(),
+      &callback);
   RunOnOtherThread(task);
   EXPECT_TRUE(callback.did_run());
   EXPECT_EQ(1, callback.result());
 }
 
 TEST_F(MultiThreadedCookieMonsterTest, ThreadCheckDeleteAllForHost) {
   scoped_refptr<CookieMonster> cm(new CookieMonster(NULL, NULL));
   CookieOptions options;
   EXPECT_TRUE(SetCookieWithOptions(cm.get(), url_google_, "A=B", options));
   EXPECT_EQ(1, DeleteAllForHost(cm.get(), url_google_));
   EXPECT_TRUE(SetCookieWithOptions(cm.get(), url_google_, "A=B", options));
   ResultSavingCookieCallback<int> callback(&other_thread_);
-  base::Closure task = base::Bind(
-      &net::MultiThreadedCookieMonsterTest::DeleteAllForHostTask,
-      base::Unretained(this),
-      cm, url_google_, &callback);
+  base::Closure task =
+      base::Bind(&net::MultiThreadedCookieMonsterTest::DeleteAllForHostTask,
+                 base::Unretained(this),
+                 cm,
+                 url_google_,
+                 &callback);
   RunOnOtherThread(task);
   EXPECT_TRUE(callback.did_run());
   EXPECT_EQ(1, callback.result());
 }
 
 TEST_F(MultiThreadedCookieMonsterTest,
        ThreadCheckDeleteAllCreatedBetweenForHost) {
   scoped_refptr<CookieMonster> cm(new CookieMonster(NULL, NULL));
   GURL url_not_google("http://www.notgoogle.com");
 
@@ skipping 12 matching lines @@
   // This cookie does not match host.
   EXPECT_TRUE(SetCookieWithOptions(cm.get(), url_not_google, "E=F", options));
 
   // This cookie does not match time range: [ago3, inf], for first deletion, but
   // matches for the second deletion.
   EXPECT_TRUE(cm->SetCookieWithCreationTime(url_google_, "G=H", ago2));
 
   // 1. First set of deletions.
   EXPECT_EQ(
       3,  // Deletes A=B, C=D, Y=Z
-      DeleteAllCreatedBetweenForHost(
-          cm.get(), ago3, Time::Max(), url_google_));
+      DeleteAllCreatedBetweenForHost(cm.get(), ago3, Time::Max(), url_google_));
 
   EXPECT_TRUE(SetCookieWithOptions(cm.get(), url_google_, "A=B", options));
   ResultSavingCookieCallback<int> callback(&other_thread_);
 
   // 2. Second set of deletions.
   base::Closure task = base::Bind(
       &net::MultiThreadedCookieMonsterTest::DeleteAllCreatedBetweenForHostTask,
       base::Unretained(this),
-      cm, ago1, Time(), url_google_,
+      cm,
+      ago1,
+      Time(),
+      url_google_,
       &callback);
   RunOnOtherThread(task);
   EXPECT_TRUE(callback.did_run());
   EXPECT_EQ(2, callback.result());  // Deletes A=B, G=H.
 }
 
 TEST_F(MultiThreadedCookieMonsterTest, ThreadCheckDeleteCanonicalCookie) {
   scoped_refptr<CookieMonster> cm(new CookieMonster(NULL, NULL));
   CookieOptions options;
   EXPECT_TRUE(SetCookieWithOptions(cm.get(), url_google_, "A=B", options));
   CookieList cookies = GetAllCookies(cm.get());
   CookieList::iterator it = cookies.begin();
   EXPECT_TRUE(DeleteCanonicalCookie(cm.get(), *it));
 
   EXPECT_TRUE(SetCookieWithOptions(cm.get(), url_google_, "A=B", options));
   ResultSavingCookieCallback<bool> callback(&other_thread_);
   cookies = GetAllCookies(cm.get());
   it = cookies.begin();
   base::Closure task = base::Bind(
       &net::MultiThreadedCookieMonsterTest::DeleteCanonicalCookieTask,
       base::Unretained(this),
-      cm, *it, &callback);
+      cm,
+      *it,
+      &callback);
   RunOnOtherThread(task);
   EXPECT_TRUE(callback.did_run());
   EXPECT_TRUE(callback.result());
 }
 
 TEST_F(CookieMonsterTest, InvalidExpiryTime) {
   std::string cookie_line =
       std::string(kValidCookieLine) + "; expires=Blarg arg arg";
-  scoped_ptr<CanonicalCookie> cookie(
-      CanonicalCookie::Create(url_google_, cookie_line, Time::Now(),
-                              CookieOptions()));
+  scoped_ptr<CanonicalCookie> cookie(CanonicalCookie::Create(
+      url_google_, cookie_line, Time::Now(), CookieOptions()));
   ASSERT_FALSE(cookie->IsPersistent());
 }
 
 // Test that CookieMonster writes session cookies into the underlying
 // CookieStore if the "persist session cookies" option is on.
 TEST_F(CookieMonsterTest, PersistSessionCookies) {
-  scoped_refptr<MockPersistentCookieStore> store(
-      new MockPersistentCookieStore);
+  scoped_refptr<MockPersistentCookieStore> store(new MockPersistentCookieStore);
   scoped_refptr<CookieMonster> cm(new CookieMonster(store.get(), NULL));
   cm->SetPersistSessionCookies(true);
 
   // All cookies set with SetCookie are session cookies.
   EXPECT_TRUE(SetCookie(cm.get(), url_google_, "A=B"));
   EXPECT_EQ("A=B", GetCookies(cm.get(), url_google_));
 
   // The cookie was written to the backing store.
   EXPECT_EQ(1u, store->commands().size());
   EXPECT_EQ(CookieStoreCommand::ADD, store->commands()[0].type);
@@ skipping 15 matching lines @@
   DeleteCookie(cm.get(), url_google_, "A");
   EXPECT_EQ("", GetCookies(cm.get(), url_google_));
   EXPECT_EQ(4u, store->commands().size());
   EXPECT_EQ(CookieStoreCommand::REMOVE, store->commands()[3].type);
   EXPECT_EQ("A", store->commands()[3].cookie.Name());
   EXPECT_EQ("C", store->commands()[3].cookie.Value());
 }
 
 // Test the commands sent to the persistent cookie store.
 TEST_F(CookieMonsterTest, PersisentCookieStorageTest) {
-  scoped_refptr<MockPersistentCookieStore> store(
-      new MockPersistentCookieStore);
+  scoped_refptr<MockPersistentCookieStore> store(new MockPersistentCookieStore);
   scoped_refptr<CookieMonster> cm(new CookieMonster(store.get(), NULL));
 
   // Add a cookie.
   EXPECT_TRUE(SetCookie(
       cm.get(), url_google_, "A=B; expires=Mon, 18-Apr-22 22:50:13 GMT"));
   this->MatchCookieLines("A=B", GetCookies(cm.get(), url_google_));
   ASSERT_EQ(1u, store->commands().size());
   EXPECT_EQ(CookieStoreCommand::ADD, store->commands()[0].type);
   // Remove it.
   EXPECT_TRUE(SetCookie(cm.get(), url_google_, "A=B; max-age=0"));
@@ skipping 26 matching lines @@
 // See http://crbug.com/238041 for background.
 TEST_F(CookieMonsterTest, ControlCharacterPurge) {
   const Time now1(Time::Now());
   const Time now2(Time::Now() + TimeDelta::FromSeconds(1));
   const Time now3(Time::Now() + TimeDelta::FromSeconds(2));
   const Time later(now1 + TimeDelta::FromDays(1));
   const GURL url("http://host/path");
   const std::string domain("host");
   const std::string path("/path");
 
-  scoped_refptr<MockPersistentCookieStore> store(
-      new MockPersistentCookieStore);
+  scoped_refptr<MockPersistentCookieStore> store(new MockPersistentCookieStore);
 
   std::vector<CanonicalCookie*> initial_cookies;
 
-  AddCookieToList(domain,
-                  "foo=bar; path=" + path,
-                  now1,
-                  &initial_cookies);
+  AddCookieToList(domain, "foo=bar; path=" + path, now1, &initial_cookies);
 
   // We have to manually build this cookie because it contains a control
   // character, and our cookie line parser rejects control characters.
-  CanonicalCookie *cc = new CanonicalCookie(url, "baz", "\x05" "boo", domain,
-                                            path, now2, later, now2, false,
-                                            false, COOKIE_PRIORITY_DEFAULT);
+  CanonicalCookie* cc = new CanonicalCookie(url,
+                                            "baz",
+                                            "\x05"
+                                            "boo",
+                                            domain,
+                                            path,
+                                            now2,
+                                            later,
+                                            now2,
+                                            false,
+                                            false,
+                                            COOKIE_PRIORITY_DEFAULT);
   initial_cookies.push_back(cc);
 
-  AddCookieToList(domain,
-                  "hello=world; path=" + path,
-                  now3,
-                  &initial_cookies);
+  AddCookieToList(domain, "hello=world; path=" + path, now3, &initial_cookies);
 
   // Inject our initial cookies into the mock PersistentCookieStore.
   store->SetLoadExpectation(true, initial_cookies);
 
   scoped_refptr<CookieMonster> cm(new CookieMonster(store.get(), NULL));
 
   EXPECT_EQ("foo=bar; hello=world", GetCookies(cm.get(), url));
 }
 
 }  // namespace net