Mac/clang: Possibly contentious changes.

chrome/browser/autocomplete/autocomplete_edit_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_edit_view_mac.h"
 
 #include <Carbon/Carbon.h>  // kVK_Return
 
 #include "app/clipboard/clipboard.h"
 #include "app/clipboard/scoped_clipboard_writer.h"
@@ skipping 37 matching lines @@
 // scope, when the window resigns key the autocomplete popup is
 // closed.  |model_| still believes it has focus, and the popup will
 // be regenerated on the user's next edit.  That seems to match how
 // things work on other platforms.
 
 namespace {
 
 // TODO(shess): This is ugly, find a better way.  Using it right now
 // so that I can crib from gtk and still be able to see that I'm using
 // the same values easily.
-const NSColor* ColorWithRGBBytes(int rr, int gg, int bb) {
+NSColor* ColorWithRGBBytes(int rr, int gg, int bb) {
   DCHECK_LE(rr, 255);
   DCHECK_LE(bb, 255);
   DCHECK_LE(gg, 255);
   return [NSColor colorWithCalibratedRed:static_cast<float>(rr)/255.0
                                    green:static_cast<float>(gg)/255.0
                                     blue:static_cast<float>(bb)/255.0
                                    alpha:1.0];
 }
 
-const NSColor* HostTextColor() {
+NSColor* HostTextColor() {
   return [NSColor blackColor];
 }
-const NSColor* BaseTextColor() {
+NSColor* BaseTextColor() {
   return [NSColor darkGrayColor];
 }
-const NSColor* EVSecureSchemeColor() {
+NSColor* EVSecureSchemeColor() {
   return ColorWithRGBBytes(0x07, 0x95, 0x00);
 }
-const NSColor* SecureSchemeColor() {
+NSColor* SecureSchemeColor() {
   return ColorWithRGBBytes(0x00, 0x0e, 0x95);
 }
-const NSColor* SecurityErrorSchemeColor() {
+NSColor* SecurityErrorSchemeColor() {
   return ColorWithRGBBytes(0xa2, 0x00, 0x00);
 }
 
 // Store's the model and view state across tab switches.
 struct AutocompleteEditViewMacState {
   AutocompleteEditViewMacState(const AutocompleteEditModel::State model_state,
                                const bool has_focus, const NSRange& selection)
       : model_state(model_state),
         has_focus(has_focus),
         selection(selection) {
@@ skipping 831 matching lines @@
   }
 
   return std::wstring();
 }
 
 // static
 NSFont* AutocompleteEditViewMac::GetFieldFont() {
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   return rb.GetFont(ResourceBundle::BaseFont).nativeFont();
 }