Remove use of linked_ptr from ExtensionWarningSet

chrome/browser/extensions/extension_warning_set.h

 // Copyright (c) 2012 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_WARNING_SET_H_
 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_WARNING_SET_H_
 
 #include <set>
 #include <string>
 #include <vector>
 
-#include "base/memory/linked_ptr.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string16.h"
 #include "base/threading/non_thread_safe.h"
 #include "googleurl/src/gurl.h"
 
 class ExtensionGlobalErrorBadge;
 class ExtensionService;
 class Profile;
 
 // TODO(battre) Remove the Extension prefix.
@@ skipping 72 matching lines @@
   int message_id_;
   // Parameters to be filled into the string identified by |message_id_|.
   std::vector<std::string> message_parameters_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionWarning);
 };
 
 // Compare ExtensionWarnings based on the tuple of (extension_id, type).
 // The message associated with ExtensionWarnings is purely informational
 // and does not contribute to distinguishing extensions.
-bool operator<(const linked_ptr<ExtensionWarning>& a,
-               const linked_ptr<ExtensionWarning>& b);
+class ExtensionWarningComparator
+    : public std::binary_function<ExtensionWarning*, ExtensionWarning*, bool> {
+ public:
+  bool operator()(ExtensionWarning* a, ExtensionWarning* b) const;
+};
 
 // Container for ExtensionWarnings intended to be passed between threads.
 // This exists to work around the lack of thread-safety of linke_ptrs.
 // Only one thread should have access to an ExtensionWarningSet at any time.
 class ExtensionWarningSet {
  public:
+  typedef std::set<ExtensionWarning*, ExtensionWarningComparator> Set;
+
   ExtensionWarningSet();
   ~ExtensionWarningSet();
 
   // Inserts |warning| into the warning set if it is unique under operator<():
   // If |warnings_| contains an entry of the same type and extension_id, the
   // insertion is ignored.
   void Insert(scoped_ptr<ExtensionWarning> warning);
 
-  // Returns and resets |warnings_|.
-  std::set<linked_ptr<ExtensionWarning> > Release();
+  // Returns and resets |warnings_|. The ownership of the ExtensionWarnings
+  // is passed to the caller.
+  Set Release();
 
   bool IsEmpty() const;
 
  private:
-  std::set<linked_ptr<ExtensionWarning> > warnings_;
+  // We own the objects in this dictionary.
+  Set warnings_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionWarningSet);
 };
 
 // Manages a set of warnings caused by extensions. These warnings (e.g.
 // conflicting modifications of network requests by extensions, slow extensions,
 // etc.) trigger a warning badge in the UI and and provide means to resolve
 // them. This class must be used on the UI thread only.
 class ExtensionWarningService : public base::NonThreadSafe {
  public:
@@ skipping 34 matching lines @@
   // |warnings| occurred and triggers a warning badge.
   static void NotifyWarningsOnUI(
       void* profile_id,
       scoped_ptr<ExtensionWarningSet> warnings);
 
  protected:
   // Virtual for testing.
   virtual void NotifyWarningsChanged();
 
  private:
-  typedef std::set<linked_ptr<ExtensionWarning> >::const_iterator
-      const_iterator;
-  typedef std::set<linked_ptr<ExtensionWarning> >::iterator iterator;
+  typedef ExtensionWarningSet::Set::const_iterator const_iterator;
+  typedef ExtensionWarningSet::Set::iterator iterator;
 
   // Shows or hides the warning badge on the wrench menu depending on whether
   // any non-suppressed warnings exist.
   void UpdateWarningBadge();
 
-  // Currently existing warnings.
-  std::set<linked_ptr<ExtensionWarning> > warnings_;
+  // Currently existing warnings. We own these warnings.
+  ExtensionWarningSet::Set warnings_;
 
   // Warnings that do not trigger a badge on the wrench menu.
-  std::set<linked_ptr<ExtensionWarning> > badge_suppressions_;
+  // Weak pointers to objects in |warnings_|.
+  ExtensionWarningSet::Set badge_suppressions_;
 
   Profile* profile_;
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_WARNING_SET_H_