[Merge to 2785] Fix many memory leaks in chrome/browser/ui/cocoa/omnibox.

chrome/browser/ui/cocoa/omnibox/omnibox_popup_cell.mm

 // Copyright 2013 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.
 
 #import "chrome/browser/ui/cocoa/omnibox/omnibox_popup_cell.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/i18n/rtl.h"
 #include "base/mac/foundation_util.h"
+#include "base/mac/objc_property_releaser.h"
 #include "base/mac/scoped_nsobject.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.h"
 #include "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h"
 #import "chrome/browser/ui/cocoa/themed_window.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/omnibox/browser/omnibox_popup_model.h"
@@ skipping 364 matching lines @@
                                value:DimTextColor(is_dark_theme)
                                range:range];
     }
   }
 
   return attributedString;
 }
 
 }  // namespace
 
+@interface OmniboxPopupCellData () {
+  base::mac::ObjCPropertyReleaser propertyReleaser_OmniboxPopupCellData_;
+}
+@end
+
 @interface OmniboxPopupCell ()
 - (CGFloat)drawMatchPart:(NSAttributedString*)attributedString
                withFrame:(NSRect)cellFrame
                   origin:(NSPoint)origin
             withMaxWidth:(int)maxWidth
             forDarkTheme:(BOOL)isDarkTheme;
 - (CGFloat)drawMatchPrefixWithFrame:(NSRect)cellFrame
                           tableView:(OmniboxPopupMatrix*)tableView
                withContentsMaxWidth:(int*)contentsMaxWidth
                        forDarkTheme:(BOOL)isDarkTheme;
@@ skipping 50 matching lines @@
       contents_ = [CreateClassifiedAttributedString(
           match.contents, ContentTextColor(isDarkTheme), match.contents_class,
           isDarkTheme) retain];
       if (!match.description.empty()) {
         description_ = [CreateClassifiedAttributedString(
             match.description, DimTextColor(isDarkTheme),
             match.description_class, isDarkTheme) retain];
       }
       max_lines_ = 1;
     }
+    propertyReleaser_OmniboxPopupCellData_.Init(self,
+                                                [OmniboxPopupCellData class]);
   }
   return self;
 }
 
-- (void)dealloc {
-  [incognitoImage_ release];
-  [super dealloc];
-}
-
 - (instancetype)copyWithZone:(NSZone*)zone {
   return [self retain];
 }
 
 - (CGFloat)getMatchContentsWidth {
   return [contents_ size].width;
 }
 
 @end
 
@@ skipping 249 matching lines @@
   base::string16 raw_separator =
       l10n_util::GetStringUTF16(IDS_AUTOCOMPLETE_MATCH_DESCRIPTION_SEPARATOR);
   return CreateAttributedString(raw_separator, DimTextColor(isDarkTheme));
 }
 
 + (CGFloat)getContentAreaWidth:(NSRect)cellFrame {
   return NSWidth(cellFrame) - TextStartOffset();
 }
 
 @end