RefCounted types should not have public destructors, chrome/browser/ui

chrome/browser/ui/webui/quota_internals_proxy.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/quota_internals_proxy.h"
 
 #include <set>
 #include <string>
 
 #include "base/bind.h"
 #include "chrome/browser/ui/webui/quota_internals_handler.h"
 #include "chrome/browser/ui/webui/quota_internals_types.h"
 #include "net/base/net_util.h"
 
 using content::BrowserThread;
 
 namespace quota_internals {
 
 QuotaInternalsProxy::QuotaInternalsProxy(QuotaInternalsHandler* handler)
     : handler_(handler),
       weak_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
 }
 
-QuotaInternalsProxy::~QuotaInternalsProxy() {}
-
-#define RELAY_TO_HANDLER(func, arg_t) \
-  void QuotaInternalsProxy::func(arg_t arg) {                 \
-    if (!handler_)                                            \
-      return;                                                 \
-    if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) {     \
-      BrowserThread::PostTask(                                \
-          BrowserThread::UI, FROM_HERE,                       \
-          base::Bind(&QuotaInternalsProxy::func, this, arg)); \
-      return;                                                 \
-    }                                                         \
-                                                              \
-    handler_->func(arg);                                      \
-  }
-
-RELAY_TO_HANDLER(ReportAvailableSpace, int64)
-RELAY_TO_HANDLER(ReportGlobalInfo, const GlobalStorageInfo&)
-RELAY_TO_HANDLER(ReportPerHostInfo, const std::vector<PerHostStorageInfo>&)
-RELAY_TO_HANDLER(ReportPerOriginInfo, const std::vector<PerOriginStorageInfo>&)
-RELAY_TO_HANDLER(ReportStatistics, const Statistics&)
-
-#undef RELAY_TO_HANDLER
-
 void QuotaInternalsProxy::RequestInfo(
     scoped_refptr<quota::QuotaManager> quota_manager) {
   DCHECK(quota_manager);
   if (!BrowserThread::CurrentlyOn(BrowserThread::IO)) {
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE,
         base::Bind(&QuotaInternalsProxy::RequestInfo, this, quota_manager));
     return;
   }
 
@@ skipping 22 matching lines @@
 
   quota_manager_->DumpOriginInfoTable(
       base::Bind(&QuotaInternalsProxy::DidDumpOriginInfoTable,
                  weak_factory_.GetWeakPtr()));
 
   std::map<std::string, std::string> stats;
   quota_manager_->GetStatistics(&stats);
   ReportStatistics(stats);
 }
 
+QuotaInternalsProxy::~QuotaInternalsProxy() {}
+
+#define RELAY_TO_HANDLER(func, arg_t) \
+  void QuotaInternalsProxy::func(arg_t arg) {                 \
+    if (!handler_)                                            \
+      return;                                                 \
+    if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) {     \
+      BrowserThread::PostTask(                                \
+          BrowserThread::UI, FROM_HERE,                       \
+          base::Bind(&QuotaInternalsProxy::func, this, arg)); \
+      return;                                                 \
+    }                                                         \
+                                                              \
+    handler_->func(arg);                                      \
+  }
+
+RELAY_TO_HANDLER(ReportAvailableSpace, int64)
+RELAY_TO_HANDLER(ReportGlobalInfo, const GlobalStorageInfo&)
+RELAY_TO_HANDLER(ReportPerHostInfo, const std::vector<PerHostStorageInfo>&)
+RELAY_TO_HANDLER(ReportPerOriginInfo, const std::vector<PerOriginStorageInfo>&)
+RELAY_TO_HANDLER(ReportStatistics, const Statistics&)
+
+#undef RELAY_TO_HANDLER
+
 void QuotaInternalsProxy::DidGetAvailableSpace(quota::QuotaStatusCode status,
                                                int64 space) {
   if (status == quota::kQuotaStatusOk)
     ReportAvailableSpace(space);
 }
 
 void QuotaInternalsProxy::DidGetGlobalQuota(quota::QuotaStatusCode status,
                                             quota::StorageType type,
                                             int64 quota) {
   if (status == quota::kQuotaStatusOk) {
@@ skipping 60 matching lines @@
   if (report_pending_.size() >= 10 || hosts_pending_.empty()) {
     ReportPerHostInfo(report_pending_);
     report_pending_.clear();
   }
 
   if (!hosts_pending_.empty())
     GetHostUsage(hosts_pending_.begin()->first,
                  hosts_pending_.begin()->second);
 }
 
-void QuotaInternalsProxy::VisitHost(const std::string& host,
-                                    quota::StorageType type) {
-  if (hosts_visited_.insert(std::make_pair(host, type)).second) {
-    hosts_pending_.insert(std::make_pair(host, type));
-    if (hosts_pending_.size() == 1) {
-      GetHostUsage(host, type);
-    }
-  }
-}
-
-void QuotaInternalsProxy::GetHostUsage(const std::string& host,
-                                       quota::StorageType type) {
-  DCHECK(quota_manager_);
-  quota_manager_->GetHostUsage(
-      host, type,
-      base::Bind(&QuotaInternalsProxy::DidGetHostUsage,
-                 weak_factory_.GetWeakPtr()));
-}
-
 void QuotaInternalsProxy::RequestPerOriginInfo(quota::StorageType type) {
   DCHECK(quota_manager_);
 
   std::set<GURL> origins;
   quota_manager_->GetCachedOrigins(type, &origins);
 
   std::vector<PerOriginStorageInfo> origin_info;
   origin_info.reserve(origins.size());
 
   std::set<std::string> hosts;
   std::vector<PerHostStorageInfo> host_info;
 
   for (std::set<GURL>::iterator itr(origins.begin());
        itr != origins.end(); ++itr) {
     PerOriginStorageInfo info(*itr, type);
     info.set_in_use(quota_manager_->IsOriginInUse(*itr));
     origin_info.push_back(info);
 
     std::string host(net::GetHostOrSpecFromURL(*itr));
     if (hosts.insert(host).second) {
       PerHostStorageInfo info(host, type);
       host_info.push_back(info);
       VisitHost(host, type);
     }
   }
   ReportPerOriginInfo(origin_info);
   ReportPerHostInfo(host_info);
 }
 
+void QuotaInternalsProxy::VisitHost(const std::string& host,
+                                    quota::StorageType type) {
+  if (hosts_visited_.insert(std::make_pair(host, type)).second) {
+    hosts_pending_.insert(std::make_pair(host, type));
+    if (hosts_pending_.size() == 1) {
+      GetHostUsage(host, type);
+    }
+  }
+}
+
+void QuotaInternalsProxy::GetHostUsage(const std::string& host,
+                                       quota::StorageType type) {
+  DCHECK(quota_manager_);
+  quota_manager_->GetHostUsage(
+      host, type,
+      base::Bind(&QuotaInternalsProxy::DidGetHostUsage,
+                 weak_factory_.GetWeakPtr()));
+}
+
 }  // namespace quota_internals