Mac/clang: Possibly contentious changes.

chrome/browser/autocomplete/autocomplete_popup_view_mac.mm

 // Copyright (c) 2010 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/autocomplete/autocomplete_popup_view_mac.h"
 
 #include "app/resource_bundle.h"
 #include "app/text_elider.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_edit.h"
@@ skipping 57 matching lines @@
 NSColor* BackgroundColor() {
   return [[NSColor controlBackgroundColor] colorWithAlphaComponent:kPopupAlpha];
 }
 NSColor* SelectedBackgroundColor() {
   return [[NSColor selectedControlColor] colorWithAlphaComponent:kPopupAlpha];
 }
 NSColor* HoveredBackgroundColor() {
   return [[NSColor controlHighlightColor] colorWithAlphaComponent:kPopupAlpha];
 }
 
-static const NSColor* ContentTextColor() {
+static NSColor* ContentTextColor() {
   return [NSColor blackColor];
 }
-static const NSColor* URLTextColor() {
+static NSColor* URLTextColor() {
   return [NSColor colorWithCalibratedRed:0.0 green:0.55 blue:0.0 alpha:1.0];
 }
-static const NSColor* DescriptionTextColor() {
+static NSColor* DescriptionTextColor() {
   return [NSColor darkGrayColor];
 }
 
 }  // namespace
 
 // Helper for MatchText() to allow sharing code between the contents
 // and description cases.  Returns NSMutableAttributedString as a
 // convenience for MatchText().
 NSMutableAttributedString* AutocompletePopupViewMac::DecorateMatchedString(
     const std::wstring &matchString,
@@ skipping 604 matching lines @@
                        bottomRightCornerRadius:0.0];
 
   // Draw the matrix clipped to our border.
   [NSGraphicsContext saveGraphicsState];
   [path addClip];
   [super drawRect:rect];
   [NSGraphicsContext restoreGraphicsState];
 }
 
 @end