5 files changed, 11 insertions, 7 deletions
diff --git a/net/tools/quic/quic_client.h b/net/tools/quic/quic_client.h
index e5a72bf..5dff8cfe 100644
--- a/net/tools/quic/quic_client.h
+++ b/net/tools/quic/quic_client.h
@@ -161,9 +161,11 @@ class QuicClient : public QuicClientBase,
   // Otherwise, return -1.
   int GetLatestFD() const;
 
-  void set_bind_to_address(IPAddress address) { bind_to_address_ = address; }
+  void set_bind_to_address(const IPAddress& address) {
+    bind_to_address_ = address;
+  }
 
-  IPAddress bind_to_address() const { return bind_to_address_; }
+  const IPAddress& bind_to_address() const { return bind_to_address_; }
 
   void set_local_port(int local_port) { local_port_ = local_port; }
 
diff --git a/net/tools/quic/quic_simple_client.h b/net/tools/quic/quic_simple_client.h
index 5cdff0d..0ac0087 100644
--- a/net/tools/quic/quic_simple_client.h
+++ b/net/tools/quic/quic_simple_client.h
@@ -142,9 +142,11 @@ class QuicSimpleClient : public QuicClientBase,
   // Otherwise, deletes the data.  Takes ownerership of |data_to_resend|.
   void MaybeAddQuicDataToResend(QuicDataToResend* data_to_resend);
 
-  void set_bind_to_address(IPAddress address) { bind_to_address_ = address; }
+  void set_bind_to_address(const IPAddress& address) {
+    bind_to_address_ = address;
+  }
 
-  IPAddress bind_to_address() const { return bind_to_address_; }
+  const IPAddress& bind_to_address() const { return bind_to_address_; }
 
   void set_local_port(int local_port) { local_port_ = local_port; }
 
diff --git a/net/tools/quic/test_tools/quic_test_client.cc b/net/tools/quic/test_tools/quic_test_client.cc
index b1bf3a9..7e6d413 100644
--- a/net/tools/quic/test_tools/quic_test_client.cc
+++ b/net/tools/quic/test_tools/quic_test_client.cc
@@ -628,7 +628,7 @@ IPAddress QuicTestClient::bind_to_address() const {
   return client_->bind_to_address();
 }
 
-void QuicTestClient::set_bind_to_address(IPAddress address) {
+void QuicTestClient::set_bind_to_address(const IPAddress& address) {
   client_->set_bind_to_address(address);
 }
 
diff --git a/net/tools/quic/test_tools/quic_test_client.h b/net/tools/quic/test_tools/quic_test_client.h
index 7bfa0b5..df38ad5 100644
--- a/net/tools/quic/test_tools/quic_test_client.h
+++ b/net/tools/quic/test_tools/quic_test_client.h
@@ -131,7 +131,7 @@ class QuicTestClient : public test::SimpleClient,
   void MigrateSocket(const IPAddress& new_host) override;
   std::string SerializeMessage(const HTTPMessage& message) override;
   IPAddress bind_to_address() const override;
-  void set_bind_to_address(IPAddress address) override;
+  void set_bind_to_address(const IPAddress& address) override;
   const IPEndPoint& address() const override;
   size_t requests_sent() const override;
 
diff --git a/net/tools/quic/test_tools/simple_client.h b/net/tools/quic/test_tools/simple_client.h
index ad9c00e..3c5d02c 100644
--- a/net/tools/quic/test_tools/simple_client.h
+++ b/net/tools/quic/test_tools/simple_client.h
@@ -105,7 +105,7 @@ class SimpleClient {
   // called in advance. If it's set to uninitialized IPAddress, default loopback
   // address will be used.
   virtual IPAddress bind_to_address() const = 0;
-  virtual void set_bind_to_address(IPAddress address) = 0;
+  virtual void set_bind_to_address(const IPAddress& address) = 0;
 
   // Returns true if the headers have been processed and are available.
   virtual bool response_headers_complete() const = 0;