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: content/shell/browser/layout_test/layout_test_bluetooth_chooser_factory.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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "content/shell/browser/layout_test/layout_test_bluetooth_chooser_factor y.h" 5 #include "content/shell/browser/layout_test/layout_test_bluetooth_chooser_factor y.h"
6 6
7 #include "base/macros.h" 7 #include "base/macros.h"
8 #include "base/memory/ptr_util.h" 8 #include "base/memory/ptr_util.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "content/public/browser/render_frame_host.h" 10 #include "content/public/browser/render_frame_host.h"
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 std::string event = "remove-device("; 80 std::string event = "remove-device(";
81 event += device_id; 81 event += device_id;
82 event += ")"; 82 event += ")";
83 factory_->events_.push_back(event); 83 factory_->events_.push_back(event);
84 } 84 }
85 85
86 EventHandler event_handler; 86 EventHandler event_handler;
87 87
88 private: 88 private:
89 void CheckFactory() const { 89 void CheckFactory() const {
90 CHECK(factory_) << "The factory should cancel all choosers in its " 90 // The factory should cancel all choosers in its destructor, and choosers
91 "destructor, and choosers should be destroyed " 91 // should be destroyed synchronously when canceled.
92 "synchronously when canceled."; 92 CHECK(factory_);
93 } 93 }
94 94
95 base::WeakPtr<LayoutTestBluetoothChooserFactory> factory_; 95 base::WeakPtr<LayoutTestBluetoothChooserFactory> factory_;
96 96
97 DISALLOW_COPY_AND_ASSIGN(Chooser); 97 DISALLOW_COPY_AND_ASSIGN(Chooser);
98 }; 98 };
99 99
100 LayoutTestBluetoothChooserFactory::LayoutTestBluetoothChooserFactory() 100 LayoutTestBluetoothChooserFactory::LayoutTestBluetoothChooserFactory()
101 : weak_this_(this) {} 101 : weak_this_(this) {}
102 102
(...skipping 26 matching lines...) Expand all
129 const std::string& device_id) { 129 const std::string& device_id) {
130 // Copy |choosers_| to make sure event handler executions that modify 130 // Copy |choosers_| to make sure event handler executions that modify
131 // |choosers_| don't invalidate iterators. 131 // |choosers_| don't invalidate iterators.
132 std::vector<Chooser*> choosers_copy(choosers_.begin(), choosers_.end()); 132 std::vector<Chooser*> choosers_copy(choosers_.begin(), choosers_.end());
133 for (Chooser* chooser : choosers_copy) { 133 for (Chooser* chooser : choosers_copy) {
134 chooser->event_handler.Run(event, device_id); 134 chooser->event_handler.Run(event, device_id);
135 } 135 }
136 } 136 }
137 137
138 } // namespace content 138 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698