Revert 166369 - Revert 166365 - roll clang 165787:167488

chrome/browser/ui/cocoa/history_menu_cocoa_controller_unittest.mm

 // Copyright (c) 2011 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 "base/memory/scoped_nsobject.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
@@ skipping 10 matching lines @@
 @implementation FakeHistoryMenuController
 
 - (id)initTest {
   if ((self = [super init])) {
     opened_[0] = NO;
     opened_[1] = NO;
   }
   return self;
 }
 
-- (void)openURLForItem:(HistoryMenuBridge::HistoryItem*)item {
+- (void)openURLForItem:(const HistoryMenuBridge::HistoryItem*)item {
   opened_[item->session_id] = YES;
 }
 
 @end  // FakeHistoryMenuController
 
 class HistoryMenuCocoaControllerTest : public CocoaProfileTest {
  public:
   virtual void SetUp() OVERRIDE {
     CocoaProfileTest::SetUp();
     ASSERT_TRUE(profile());
@@ skipping 37 matching lines @@
   std::map<NSMenuItem*, HistoryMenuBridge::HistoryItem*>::iterator it =
       items.begin();
 
   for ( ; it != items.end(); ++it) {
     HistoryMenuBridge::HistoryItem* item = it->second;
     EXPECT_FALSE(controller()->opened_[item->session_id]);
     [controller() openHistoryMenuItem:it->first];
     EXPECT_TRUE(controller()->opened_[item->session_id]);
   }
 }