Browsing Data Deletion: Style fixes

chrome/browser/browsing_data/mock_browsing_data_channel_id_helper.cc

 // Copyright 2014 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 "chrome/browser/browsing_data/mock_browsing_data_channel_id_helper.h"
 
 #include "base/logging.h"
+#include "testing/gtest/include/gtest/gtest.h"
 
 MockBrowsingDataChannelIDHelper::MockBrowsingDataChannelIDHelper()
     : BrowsingDataChannelIDHelper() {}
 
 MockBrowsingDataChannelIDHelper::
 ~MockBrowsingDataChannelIDHelper() {}
 
 void MockBrowsingDataChannelIDHelper::StartFetching(
     const FetchResultCallback& callback) {
+  ASSERT_FALSE(callback.is_null());
+  ASSERT_TRUE(callback_.is_null());
   callback_ = callback;
 }
 
 void MockBrowsingDataChannelIDHelper::DeleteChannelID(
     const std::string& server_id) {
-  CHECK(channel_ids_.find(server_id) != channel_ids_.end());
+  ASSERT_FALSE(callback_.is_null());
+  ASSERT_TRUE(channel_ids_.find(server_id) != channel_ids_.end());
   channel_ids_[server_id] = false;
 }
 
 void MockBrowsingDataChannelIDHelper::AddChannelIDSample(
     const std::string& server_id) {
-  DCHECK(channel_ids_.find(server_id) == channel_ids_.end());
+  ASSERT_TRUE(channel_ids_.find(server_id) == channel_ids_.end());
   channel_id_list_.push_back(
       net::ChannelIDStore::ChannelID(
           server_id, base::Time(), base::Time(), "key", "cert"));
   channel_ids_[server_id] = true;
 }
 
 void MockBrowsingDataChannelIDHelper::Notify() {
   net::ChannelIDStore::ChannelIDList channel_id_list;
   for (net::ChannelIDStore::ChannelIDList::iterator i =
        channel_id_list_.begin();
@@ skipping 12 matching lines @@
 }
 
 bool MockBrowsingDataChannelIDHelper::AllDeleted() {
   for (std::map<const std::string, bool>::const_iterator i =
        channel_ids_.begin();
        i != channel_ids_.end(); ++i)
     if (i->second)
       return false;
   return true;
 }