summaryrefslogtreecommitdiffstats
path: root/remoting/base
diff options
context:
space:
mode:
authorDan Beam <dbeam@chromium.org>2015-05-04 15:01:15 -0700
committerDan Beam <dbeam@chromium.org>2015-05-04 22:02:44 +0000
commitc41830d6f55f85e2f5c8841db4b6ed81239b671d (patch)
tree377617d68c0afd7f58ec7068984a2866e676be0f /remoting/base
parentce74af160fe93ae38ea7ce0db757730058389c58 (diff)
downloadchromium_src-c41830d6f55f85e2f5c8841db4b6ed81239b671d.zip
chromium_src-c41830d6f55f85e2f5c8841db4b6ed81239b671d.tar.gz
chromium_src-c41830d6f55f85e2f5c8841db4b6ed81239b671d.tar.bz2
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 Review URL: https://codereview.chromium.org/1124563003 Cr-Commit-Position: refs/heads/master@{#328199}
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, 1 insertions, 9 deletions
diff --git a/remoting/base/auto_thread.cc b/remoting/base/auto_thread.cc
index 514b82f..2e5006b 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_);
+ base::PlatformThread::SetName(name_.c_str());
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 07bb2ec..0c74044 100644
--- a/remoting/base/buffered_socket_writer_unittest.cc
+++ b/remoting/base/buffered_socket_writer_unittest.cc
@@ -45,14 +45,6 @@ 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_; }