A build fix for gcc 4.4 (r32522)....

chrome/browser/cookies_tree_model.cc

 // Copyright (c) 2009 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/cookies_tree_model.h"
 
 #include <algorithm>
 #include <functional>
 #include <vector>
 
@@ skipping 40 matching lines @@
 }
 
 void CookieTreeCookieNode::DeleteStoredObjects() {
   GetModel()->DeleteCookie(*cookie_);
 }
 
 namespace {
 // comparison functor, for use in CookieTreeRootNode
 class OriginNodeComparator {
  public:
   bool operator() (const CookieTreeNode* lhs,

[Evan Martin, 2009/11/20 18:52:31]

May as well make this one static too?

                    const CookieTreeNode* rhs) {
     // We want to order by registry controlled domain, so we would get
     // google.com, ad.google.com, www.google.com,
     // microsoft.com, ad.microsoft.com. CanonicalizeHost transforms the origins
     // into a form like google.com.www so that string comparisons work.
     return (CanonicalizeHost(lhs->GetTitle()) <
             CanonicalizeHost(rhs->GetTitle()));
   }
 
  private:
-  std::string CanonicalizeHost(const std::wstring& host_w) {
+  static std::string CanonicalizeHost(const std::wstring& host_w) {
     // The canonicalized representation makes the registry controlled domain
     // come first, and then adds subdomains in reverse order, e.g.
     // 1.mail.google.com would become google.com.mail.1, and then a standard
     // string comparison works to order hosts by registry controlled domain
     // first. Leading dots are ignored, ".google.com" is the same as
     // "google.com".
 
     std::string host = WideToUTF8(host_w);
     std::string retval = net::RegistryControlledDomainService::
         GetDomainAndRegistry(host);
@@ skipping 187 matching lines @@
   NotifyObserverTreeNodeChanged(root);
 }
 
 void CookiesTreeModel::DeleteCookieNode(CookieTreeNode* cookie_node) {
   cookie_node->DeleteStoredObjects();
   // find the parent and index
   CookieTreeNode* parent_node = cookie_node->GetParent();
   int cookie_node_index = parent_node->IndexOfChild(cookie_node);
   delete Remove(parent_node, cookie_node_index);
 }