ApiResourceManager::persistent should be a virtual method, not a virtual accessor.

BUG=307537

Review URL: https://codereview.chromium.org/29923002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@229977 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 33 insertions, 39 deletions

diff --git a/chrome/browser/extensions/api/api_resource.cc b/chrome/browser/extensions/api/api_resource.cc
index ccbdd77..c8ddd40 100644
--- a/chrome/browser/extensions/api/api_resource.cc
+++ b/chrome/browser/extensions/api/api_resource.cc
@@ -15,7 +15,7 @@ ApiResource::ApiResource(const std::string& owner_extension_id)
 ApiResource::~ApiResource() {
 }
 
-bool ApiResource::persistent() const {
+bool ApiResource::IsPersistent() const {
     return true;  // backward-compatible behavior.
 }
 
diff --git a/chrome/browser/extensions/api/api_resource.h b/chrome/browser/extensions/api/api_resource.h
index cc4e3ff..2911cf3e 100644
--- a/chrome/browser/extensions/api/api_resource.h
+++ b/chrome/browser/extensions/api/api_resource.h
@@ -23,7 +23,9 @@ class ApiResource {
     return owner_extension_id_;
   }
 
-  virtual bool persistent() const;
+  // If this method returns |true|, the resource remains open when the
+  // owning extension is suspended due to inactivity.
+  virtual bool IsPersistent() const;
 
   static const content::BrowserThread::ID kThreadId =
       content::BrowserThread::IO;
diff --git a/chrome/browser/extensions/api/api_resource_manager.h b/chrome/browser/extensions/api/api_resource_manager.h
index 28adefd..fab663a 100644
--- a/chrome/browser/extensions/api/api_resource_manager.h
+++ b/chrome/browser/extensions/api/api_resource_manager.h
@@ -288,7 +288,7 @@ class ApiResourceManager : public ProfileKeyedAPI,
         } else {
           linked_ptr<T> ptr = api_resource_map_[*it];
           T* resource = ptr.get();
-          erase = (resource && !resource->persistent());
+          erase = (resource && !resource->IsPersistent());
         }
 
         if (erase) {
diff --git a/chrome/browser/extensions/api/socket/tcp_socket.cc b/chrome/browser/extensions/api/socket/tcp_socket.cc
index 94f7205..4f92734 100644
--- a/chrome/browser/extensions/api/socket/tcp_socket.cc
+++ b/chrome/browser/extensions/api/socket/tcp_socket.cc
@@ -322,8 +322,8 @@ ResumableTCPSocket::ResumableTCPSocket(net::TCPClientSocket* tcp_client_socket,
       paused_(false) {
 }
 
-bool ResumableTCPSocket::persistent() const {
-  return persistent_;
+bool ResumableTCPSocket::IsPersistent() const {
+  return persistent();
 }
 
 ResumableTCPServerSocket::ResumableTCPServerSocket(
@@ -333,8 +333,8 @@ ResumableTCPServerSocket::ResumableTCPServerSocket(
       paused_(false) {
 }
 
-bool ResumableTCPServerSocket::persistent() const {
-  return persistent_;
+bool ResumableTCPServerSocket::IsPersistent() const {
+  return persistent();
 }
 
 }  // namespace extensions
diff --git a/chrome/browser/extensions/api/socket/tcp_socket.h b/chrome/browser/extensions/api/socket/tcp_socket.h
index d5b4844..6cda66c 100644
--- a/chrome/browser/extensions/api/socket/tcp_socket.h
+++ b/chrome/browser/extensions/api/socket/tcp_socket.h
@@ -106,11 +106,13 @@ class ResumableTCPSocket : public TCPSocket {
                               const std::string& owner_extension_id,
                               bool is_connected);
 
+  // Overriden from ApiResource
+  virtual bool IsPersistent() const OVERRIDE;
+
   const std::string& name() const { return name_; }
   void set_name(const std::string& name) { name_ = name; }
 
-  // Overriden from ApiResource
-  virtual bool persistent() const OVERRIDE;
+  bool persistent() const { return persistent_;  }
   void set_persistent(bool persistent) { persistent_ = persistent; }
 
   int buffer_size() const { return buffer_size_; }
@@ -128,7 +130,7 @@ class ResumableTCPSocket : public TCPSocket {
   // Application-defined string - see sockets_tcp.idl.
   std::string name_;
   // Flag indicating whether the socket is left open when the application is
-  // suspended - see sockets_tcp.idl..
+  // suspended - see sockets_tcp.idl.
   bool persistent_;
   // The size of the buffer used to receive data - see sockets_tcp.idl.
   int buffer_size_;
@@ -144,10 +146,13 @@ class ResumableTCPServerSocket : public TCPSocket {
  public:
   explicit ResumableTCPServerSocket(const std::string& owner_extension_id);
 
+  // Overriden from ApiResource
+  virtual bool IsPersistent() const OVERRIDE;
+
   const std::string& name() const { return name_; }
   void set_name(const std::string& name) { name_ = name; }
 
-  virtual bool persistent() const OVERRIDE;
+  bool persistent() const { return persistent_; }
   void set_persistent(bool persistent) { persistent_ = persistent; }
 
   bool paused() const { return paused_; }
diff --git a/chrome/browser/extensions/api/socket/udp_socket.cc b/chrome/browser/extensions/api/socket/udp_socket.cc
index b4cfdcf..b6be256 100644
--- a/chrome/browser/extensions/api/socket/udp_socket.cc
+++ b/chrome/browser/extensions/api/socket/udp_socket.cc
@@ -299,28 +299,8 @@ ResumableUDPSocket::ResumableUDPSocket(const std::string& owner_extension_id)
       buffer_size_(0) {
 }
 
-const std::string& ResumableUDPSocket::name() const {
-  return name_;
-}
-
-void ResumableUDPSocket::set_name(const std::string& name) {
-  name_ = name;
-}
-
-bool ResumableUDPSocket::persistent() const {
-  return persistent_;
-}
-
-void ResumableUDPSocket::set_persistent(bool persistent) {
-  persistent_ = persistent;
-}
-
-int ResumableUDPSocket::buffer_size() const {
-  return buffer_size_;
-}
-
-void ResumableUDPSocket::set_buffer_size(int buffer_size) {
-  buffer_size_ = buffer_size;
+bool ResumableUDPSocket::IsPersistent() const {
+  return persistent();
 }
 
 }  // namespace extensions
diff --git a/chrome/browser/extensions/api/socket/udp_socket.h b/chrome/browser/extensions/api/socket/udp_socket.h
index 4989e27..e3dab20 100644
--- a/chrome/browser/extensions/api/socket/udp_socket.h
+++ b/chrome/browser/extensions/api/socket/udp_socket.h
@@ -81,14 +81,17 @@ class ResumableUDPSocket : public UDPSocket {
  public:
   explicit ResumableUDPSocket(const std::string& owner_extension_id);
 
-  const std::string& name() const;
-  void set_name(const std::string& name);
+  // Overriden from ApiResource
+  virtual bool IsPersistent() const OVERRIDE;
 
-  virtual bool persistent() const OVERRIDE;
-  void set_persistent(bool persistent);
+  const std::string& name() const { return name_; }
+  void set_name(const std::string& name) { name_ = name; }
 
-  int buffer_size() const;
-  void set_buffer_size(int buffer_size);
+  bool persistent() const { return persistent_; }
+  void set_persistent(bool persistent) { persistent_ = persistent; }
+
+  int buffer_size() const { return buffer_size_; }
+  void set_buffer_size(int buffer_size) { buffer_size_ = buffer_size; }
 
  private:
   friend class ApiResourceManager<ResumableUDPSocket>;
@@ -96,8 +99,12 @@ class ResumableUDPSocket : public UDPSocket {
     return "ResumableUDPSocketManager";
   }
 
+  // Application-defined string - see sockets_udp.idl.
   std::string name_;
+  // Flag indicating whether the socket is left open when the application is
+  // suspended - see sockets_udp.idl.
   bool persistent_;
+  // The size of the buffer used to receive data - see sockets_udp.idl.
   int buffer_size_;
 };