Refactoring: Hide or remove some methods of Resource

third_party/WebKit/Source/core/fetch/Resource.h

Index: third_party/WebKit/Source/core/fetch/Resource.h
diff --git a/third_party/WebKit/Source/core/fetch/Resource.h b/third_party/WebKit/Source/core/fetch/Resource.h
index b659b3ea967c9ed86ecf67d2d8a4ec41dac8491e..514e05e5a3060cec5de984fba3e1090f41be0cf9 100644
--- a/third_party/WebKit/Source/core/fetch/Resource.h
+++ b/third_party/WebKit/Source/core/fetch/Resource.h
@@ -143,8 +143,6 @@ public:
     };
     PreloadResult getPreloadResult() const { return static_cast<PreloadResult>(m_preloadResult); }
 
-    unsigned count() const { return m_clients.size(); }
-
     Status getStatus() const { return static_cast<Status>(m_status); }
     void setStatus(Status status) { m_status = status; }
 
@@ -197,8 +195,6 @@ public:
     // This may return nullptr when the resource isn't cacheable.
     CachedMetadataHandler* cacheHandler();
 
-    String reasonNotDeletable() const;
-
     AtomicString httpContentType() const;
 
     bool wasCanceled() const { return m_error.isCancellation(); }
@@ -244,7 +240,6 @@ public:
     virtual void onMemoryDump(WebMemoryDumpLevelOfDetail, WebProcessMemoryDump*) const;
 
     static const char* resourceTypeToString(Type, const FetchInitiatorInfo&);
-    static const char* resourceTypeName(Type);
 
 protected:
     Resource(const ResourceRequest&, Type, const ResourceLoaderOptions&);
@@ -293,6 +288,8 @@ protected:
     const HashCountedSet<ResourceClient*>& clients() const { return m_clients; }
     DataBufferingPolicy dataBufferingPolicy() const { return m_options.dataBufferingPolicy; }
 
+    unsigned count() const { return m_clients.size(); }

[hiroshige, 2016/07/19 08:30:19]

We can remove count() by replacing |count()| with |clients().size()| at the only
callsite of count() in RawResource.
Or we should rename count() to clientCount() or something that explicitly states
that this is the count of clients, not including observers.

[hajimehoshi, 2016/07/19 08:51:16]

Done.

+
     ResourceRequest m_resourceRequest;
     Member<ResourceLoader> m_loader;
 
@@ -314,6 +311,8 @@ private:
 
     bool unlock();
 
+    String reasonNotDeletable() const;
+
     Member<CachedMetadataHandlerImpl> m_cacheHandler;
     RefPtr<SecurityOrigin> m_fetcherSecurityOrigin;