Mac/clang: First pass over unit_tests

chrome/browser/cocoa/autocomplete_text_field_unittest.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.
 
 #import <Cocoa/Cocoa.h>
 
 #include "app/resource_bundle.h"
 #import "base/cocoa_protocols_mac.h"
 #include "base/scoped_nsobject.h"
 #import "chrome/browser/cocoa/autocomplete_text_field.h"
@@ skipping 338 matching lines @@
   [field_ resetFieldEditorFrameIfNeeded];
   EXPECT_TRUE(NSEqualRects(baseEditorFrame, EditorFrame()));
 }
 
 // Test that the field editor gets the same bounds when focus is
 // delivered by the standard focusing machinery, or by
 // -resetFieldEditorFrameIfNeeded.
 TEST_F(AutocompleteTextFieldTest, ResetFieldEditorSearchHint) {
   AutocompleteTextFieldCell* cell = [field_ autocompleteTextFieldCell];
 
-  const NSString* kHintString(@"Type to search");
+  NSString* const kHintString(@"Type to search");

[Mark Mentovai, 2010/06/23 13:51:28]

Use = instead of ().

 
   // Capture the editor frame resulting from the standard focus
   // machinery.
   [cell setSearchHintString:kHintString availableWidth:kWidth];
   EXPECT_TRUE([cell hintString]);
   [test_window() makePretendKeyWindowAndSetFirstResponder:field_];
   const NSRect baseEditorFrame(EditorFrame());
 
   // Clearing the hint should result in a strictly larger editor
   // frame.
@@ skipping 11 matching lines @@
   [field_ resetFieldEditorFrameIfNeeded];
   EXPECT_TRUE(NSEqualRects(baseEditorFrame, EditorFrame()));
 }
 
 // Test that the field editor gets the same bounds when focus is
 // delivered by the standard focusing machinery, or by
 // -resetFieldEditorFrameIfNeeded.
 TEST_F(AutocompleteTextFieldTest, ResetFieldEditorKeywordHint) {
   AutocompleteTextFieldCell* cell = [field_ autocompleteTextFieldCell];
 
-  const NSString* kFullString(@"Search Engine:");
-  const NSString* kPartialString(@"Search Eng:");
+  NSString* const kFullString(@"Search Engine:");

[Mark Mentovai, 2010/06/23 13:51:28]

Ditto here and on the next line.

+  NSString* const kPartialString(@"Search Eng:");
 
   // Capture the editor frame resulting from the standard focus
   // machinery.
   [cell setKeywordString:kFullString
            partialString:kPartialString
           availableWidth:kWidth];
   EXPECT_TRUE([cell keywordString]);
   [test_window() makePretendKeyWindowAndSetFirstResponder:field_];
   const NSRect baseEditorFrame(EditorFrame());
 
@@ skipping 339 matching lines @@
   // So that we can set rich text.
   [field_ setAllowsEditingTextAttributes:YES];
 
   // Set an attribute different from the field's default so we can
   // tell we got the same string out as we put in.
   NSFont* font = [NSFont fontWithDescriptor:[[field_ font] fontDescriptor]
                                        size:[[field_ font] pointSize] + 2];
   NSDictionary* attributes =
       [NSDictionary dictionaryWithObject:font
                                   forKey:NSFontAttributeName];
-  static const NSString* kString = @"This is a test";
+  NSString* const kString = @"This is a test";
   scoped_nsobject<NSAttributedString> attributedString(
       [[NSAttributedString alloc] initWithString:kString
                                       attributes:attributes]);
 
   // Check that what we get back looks like what we put in.
   EXPECT_FALSE([[field_ stringValue] isEqualToString:kString]);
   [field_ setAttributedStringValue:attributedString];
   EXPECT_TRUE([[field_ attributedStringValue]
                 isEqualToAttributedString:attributedString]);
   EXPECT_TRUE([[field_ stringValue] isEqualToString:kString]);
@@ skipping 12 matching lines @@
   EXPECT_TRUE([[field_ stringValue] isEqualToString:kString]);
 }
 
 // -setAttributedStringValue: shouldn't reset the undo state if things
 // are being editted.
 TEST_F(AutocompleteTextFieldTest, SetAttributedStringUndo) {
   NSColor* redColor = [NSColor redColor];
   NSDictionary* attributes =
       [NSDictionary dictionaryWithObject:redColor
                                   forKey:NSForegroundColorAttributeName];
-  static const NSString* kString = @"This is a test";
+  NSString* const kString = @"This is a test";
   scoped_nsobject<NSAttributedString> attributedString(
       [[NSAttributedString alloc] initWithString:kString
                                       attributes:attributes]);
   [test_window() makePretendKeyWindowAndSetFirstResponder:field_];
   EXPECT_TRUE([field_ currentEditor]);
   NSTextView* editor = static_cast<NSTextView*>([field_ currentEditor]);
   NSUndoManager* undoManager = [editor undoManager];
   EXPECT_TRUE(undoManager);
 
   // Nothing to undo, yet.
@@ skipping 91 matching lines @@
 
   // Not draggable, so no pasteboard.
   EXPECT_FALSE([field_ locationDragPasteboard]);
 
   // Gets a pasteboard when draggable.
   location_icon_view.SetDraggable(true);
   EXPECT_TRUE([field_ locationDragPasteboard]);
 }
 
 }  // namespace