Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(34)

Side by Side Diff: chromeos/dbus/dbus_thread_manager.cc

Issue 2561963002: base: Remove the string logging from CHECK(). (Closed)
Patch Set: checkstring: rebase Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chromeos/dbus/dbus_thread_manager.h" 5 #include "chromeos/dbus/dbus_thread_manager.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/memory/ptr_util.h" 10 #include "base/memory/ptr_util.h"
(...skipping 269 matching lines...) Expand 10 before | Expand all | Expand 10 after
280 CHECK(g_dbus_thread_manager); 280 CHECK(g_dbus_thread_manager);
281 DBusThreadManager* dbus_thread_manager = g_dbus_thread_manager; 281 DBusThreadManager* dbus_thread_manager = g_dbus_thread_manager;
282 g_dbus_thread_manager = nullptr; 282 g_dbus_thread_manager = nullptr;
283 g_using_dbus_thread_manager_for_testing = false; 283 g_using_dbus_thread_manager_for_testing = false;
284 delete dbus_thread_manager; 284 delete dbus_thread_manager;
285 VLOG(1) << "DBusThreadManager Shutdown completed"; 285 VLOG(1) << "DBusThreadManager Shutdown completed";
286 } 286 }
287 287
288 // static 288 // static
289 DBusThreadManager* DBusThreadManager::Get() { 289 DBusThreadManager* DBusThreadManager::Get() {
290 CHECK(g_dbus_thread_manager) 290 // DBusThreadManager::Get() called before Initialize()
291 << "DBusThreadManager::Get() called before Initialize()"; 291 CHECK(g_dbus_thread_manager);
292 return g_dbus_thread_manager; 292 return g_dbus_thread_manager;
293 } 293 }
294 294
295 DBusThreadManagerSetter::DBusThreadManagerSetter() {} 295 DBusThreadManagerSetter::DBusThreadManagerSetter() {}
296 296
297 DBusThreadManagerSetter::~DBusThreadManagerSetter() {} 297 DBusThreadManagerSetter::~DBusThreadManagerSetter() {}
298 298
299 void DBusThreadManagerSetter::SetCrasAudioClient( 299 void DBusThreadManagerSetter::SetCrasAudioClient(
300 std::unique_ptr<CrasAudioClient> client) { 300 std::unique_ptr<CrasAudioClient> client) {
301 DBusThreadManager::Get()->clients_common_->cras_audio_client_ = 301 DBusThreadManager::Get()->clients_common_->cras_audio_client_ =
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
387 std::move(client); 387 std::move(client);
388 } 388 }
389 389
390 void DBusThreadManagerSetter::SetUpdateEngineClient( 390 void DBusThreadManagerSetter::SetUpdateEngineClient(
391 std::unique_ptr<UpdateEngineClient> client) { 391 std::unique_ptr<UpdateEngineClient> client) {
392 DBusThreadManager::Get()->clients_common_->update_engine_client_ = 392 DBusThreadManager::Get()->clients_common_->update_engine_client_ =
393 std::move(client); 393 std::move(client);
394 } 394 }
395 395
396 } // namespace chromeos 396 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698