summaryrefslogtreecommitdiffstats
path: root/remoting/base
diff options
context:
space:
mode:
authordbeam <dbeam@chromium.org>2015-05-04 16:00:04 -0700
committerCommit bot <commit-bot@chromium.org>2015-05-04 23:00:36 +0000
commiteb1e4d1dd2511083e1d5506d1edfbdff68e133cc (patch)
tree7b8f2fdb338d07fc8cbfb2d7d37e90587b4b409e /remoting/base
parentdb926e49caab1e225a5ea52764b8b7fefbc982d2 (diff)
downloadchromium_src-eb1e4d1dd2511083e1d5506d1edfbdff68e133cc.zip
chromium_src-eb1e4d1dd2511083e1d5506d1edfbdff68e133cc.tar.gz
chromium_src-eb1e4d1dd2511083e1d5506d1edfbdff68e133cc.tar.bz2
Revert of Revert some other possible suspects of a 0.43% size increase of setup.exe: https://build.chromium.o… (patchset #1 id:1 of https://codereview.chromium.org/1124563003/)
Reason for revert: Broke the compile because one of these CLs is already depended on (rch@'s bce10d97d6fc5233071427cf622aaad7abde9e19). Original issue's description: > Revert some other possible suspects of a 0.43% size increase of setup.exe: https://build.chromium.org/p/chromium/builders/Win/builds/31562 > > Revert "Add granular base::File tracing." > > This reverts commit a6e05c977096a03774e5406d63ad80c0166f9adc. > > Revert "Add AllReadDataConsumed and AllWriteDataConsumed methods to SocketDataProvider" > > This reverts commit bce10d97d6fc5233071427cf622aaad7abde9e19. > > Revert "Avoid unnecessary memory allocations at PlatformThread::SetName()" > > This reverts commit 4839a142bf95776323647c82ca9dc0725f7c4f15. > > TBR=tdresser@chromium.org > BUG=none > TEST=green sizes > > Committed: https://chromium.googlesource.com/chromium/src/+/c41830d6f55f85e2f5c8841db4b6ed81239b671d TBR=tdresser@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=none Review URL: https://codereview.chromium.org/1123833003 Cr-Commit-Position: refs/heads/master@{#328207}
Diffstat (limited to 'remoting/base')
-rw-r--r--remoting/base/auto_thread.cc2
-rw-r--r--remoting/base/buffered_socket_writer_unittest.cc8
2 files changed, 9 insertions, 1 deletions
diff --git a/remoting/base/auto_thread.cc b/remoting/base/auto_thread.cc
index 2e5006b..514b82f 100644
--- a/remoting/base/auto_thread.cc
+++ b/remoting/base/auto_thread.cc
@@ -183,7 +183,7 @@ void AutoThread::ThreadMain() {
base::MessageLoop message_loop(startup_data_->loop_type);
// Complete the initialization of our AutoThread object.
- base::PlatformThread::SetName(name_.c_str());
+ base::PlatformThread::SetName(name_);
ANNOTATE_THREAD_NAME(name_.c_str()); // Tell the name to race detector.
message_loop.set_thread_name(name_);
diff --git a/remoting/base/buffered_socket_writer_unittest.cc b/remoting/base/buffered_socket_writer_unittest.cc
index 0c74044..07bb2ec 100644
--- a/remoting/base/buffered_socket_writer_unittest.cc
+++ b/remoting/base/buffered_socket_writer_unittest.cc
@@ -45,6 +45,14 @@ class SocketDataProvider: public net::SocketDataProvider {
size);
}
+ bool AllReadDataConsumed() const override {
+ return true;
+ }
+
+ bool AllWriteDataConsumed() const override {
+ return true;
+ }
+
void Reset() override {}
std::string written_data() { return written_data_; }