Changed some asserts into DCHECKs.

BUG=none
TEST=trybots

Review URL: http://codereview.chromium.org/2136016

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47773 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 10 insertions, 9 deletions

diff --git a/chrome/common/net/notifier/base/posix/time_posix.cc b/chrome/common/net/notifier/base/posix/time_posix.cc
index 45c35c1..a3d63aa 100644
--- a/chrome/common/net/notifier/base/posix/time_posix.cc
+++ b/chrome/common/net/notifier/base/posix/time_posix.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include <assert.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/time.h>
 
+#include "base/logging.h"
 #include "chrome/common/net/notifier/base/time.h"
 
 namespace notifier {
@@ -31,7 +31,7 @@ time64 TmToTime64(const struct tm& tm) {
 }
 
 bool Time64ToTm(time64 t, struct tm* tm) {
-  assert(tm != NULL);
+  DCHECK(tm);
   time_t secs = t / kSecsTo100ns;
   gmtime_r(&secs, tm);
   return true;
diff --git a/chrome/common/net/notifier/communicator/connection_settings.cc b/chrome/common/net/notifier/communicator/connection_settings.cc
index c4d29a4..0080322 100644
--- a/chrome/common/net/notifier/communicator/connection_settings.cc
+++ b/chrome/common/net/notifier/communicator/connection_settings.cc
@@ -7,6 +7,7 @@
 #include <string>
 #include <vector>
 
+#include "base/logging.h"
 #include "chrome/common/net/notifier/communicator/connection_settings.h"
 #include "talk/base/helpers.h"
 #include "talk/xmpp/xmppclientsettings.h"
@@ -22,7 +23,7 @@ class RandomGenerator {
 
 void ConnectionSettings::FillXmppClientSettings(
     buzz::XmppClientSettings* xcs) const {
-  assert(xcs);
+  DCHECK(xcs);
   xcs->set_protocol(protocol_);
   xcs->set_server(server_);
   xcs->set_proxy(proxy_.type);
@@ -89,7 +90,7 @@ void ConnectionSettingsList::PermuteForAddress(
     bool special_port_magic,
     bool proxy_only,
     std::deque<ConnectionSettings>* list_temp) {
-  assert(list_temp);
+  DCHECK(list_temp);
   *(template_.mutable_server()) = server;
 
   // Use all of the original settings
diff --git a/chrome/common/net/notifier/communicator/xmpp_connection_generator.cc b/chrome/common/net/notifier/communicator/xmpp_connection_generator.cc
index 39192de..269c19e0 100644
--- a/chrome/common/net/notifier/communicator/xmpp_connection_generator.cc
+++ b/chrome/common/net/notifier/communicator/xmpp_connection_generator.cc
@@ -46,9 +46,9 @@ XmppConnectionGenerator::XmppConnectionGenerator(
       first_dns_error_(0),
       options_(options),
       parent_(parent) {
-  assert(parent);
-  assert(options);
-  assert(server_count_ > 0);
+  DCHECK(parent);
+  DCHECK(options);
+  DCHECK_GT(server_count_, 0);
   for (int i = 0; i < server_count_; ++i) {
     server_list_[i] = server_list[i];
   }
@@ -59,7 +59,7 @@ XmppConnectionGenerator::~XmppConnectionGenerator() {
 }
 
 const talk_base::ProxyInfo& XmppConnectionGenerator::proxy() const {
-  assert(settings_list_.get());
+  DCHECK(settings_list_.get());
   if (settings_index_ >= settings_list_->GetCount()) {
     return settings_list_->proxy();
   }
@@ -165,7 +165,7 @@ void XmppConnectionGenerator::OnServerDNSResolved(
   }
 
   // Build the ip list.
-  assert(settings_list_.get());
+  DCHECK(settings_list_.get());
   settings_index_ = -1;
   settings_list_->ClearPermutations();
   settings_list_->AddPermutations(