Style fixes for previous review

webkit/tools/test_shell/mac/test_webview_delegate.mm

 // Copyright (c) 2008 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 "webkit/tools/test_shell/test_webview_delegate.h"
 
 #import <Cocoa/Cocoa.h>
+#include "base/string_util.h"
 #include "base/sys_string_conversions.h"
-#include "base/string_util.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebRect.h"
 #include "webkit/glue/webcursor.h"
 #include "webkit/glue/webview.h"
 #include "webkit/glue/plugins/plugin_list.h"
 #include "webkit/glue/plugins/webplugin_delegate_impl.h"
 #include "webkit/glue/webmenurunner_mac.h"
 #include "webkit/tools/test_shell/test_shell.h"
 
 using WebKit::WebRect;
 
@@ skipping 52 matching lines @@
     int selected_index,
     const std::vector<WebMenuItem>& items) {
   // Set up the menu position.
   NSView* web_view = shell_->webViewWnd();
   NSRect view_rect = [web_view bounds];
   int y_offset = bounds.y + bounds.height;
   NSRect position = NSMakeRect(bounds.x, view_rect.size.height - y_offset,
                                bounds.width, bounds.height);
 
   // Display the menu.
-  WebMenuRunner* menu_runner =
-      [[[WebMenuRunner alloc] initWithItems:items] autorelease];
+  scoped_nsobject<WebMenuRunner> menu_runner;
+  menu_runner.reset([[WebMenuRunner alloc] initWithItems:items]);
 
   [menu_runner runMenuInView:shell_->webViewWnd()
                   withBounds:position
                 initialIndex:selected_index];
 
   // Get the selected item and forward to WebKit. WebKit expects an input event
   // (mouse down, keyboard activity) for this, so we calculate the proper
   // position based on the selected index and provided bounds.
   WebWidgetHost* popup = shell_->popupHost();
   int window_num = [shell_->mainWnd() windowNumber];
+  NSEvent* event =
+      webkit_glue::EventWithMenuAction([menu_runner menuItemWasChosen],
+                                       window_num, item_height,
+                                       [menu_runner indexOfSelectedItem],
+                                       position, view_rect);
 
-  NSEvent* event = CreateEventForMenuAction([menu_runner menuItemWasChosen],
-                                            window_num, item_height,
-                                            [menu_runner indexOfSelectedItem],
-                                            position, view_rect);
   if ([menu_runner menuItemWasChosen]) {
     // Construct a mouse up event to simulate the selection of an appropriate
     // menu item.
     popup->MouseEvent(event);
   } else {
     // Fake an ESC key event (keyCode = 0x1B, from webinputevent_mac.mm) and
     // forward that to WebKit.
     popup->KeyEvent(event);
   }
 }
@@ skipping 94 matching lines @@
 void TestWebViewDelegate::SetPageTitle(const std::wstring& title) {
   [[shell_->webViewHost()->view_handle() window]
       setTitle:[NSString stringWithUTF8String:WideToUTF8(title).c_str()]];
 }
 
 void TestWebViewDelegate::SetAddressBarURL(const GURL& url) {
   const char* frameURL = url.spec().c_str();
   NSString *address = [NSString stringWithUTF8String:frameURL];
   [shell_->editWnd() setStringValue:address];
 }