Revert 170550 - Revert 170477 - Removes the |event| parameter from ActivationDelegate::ShouldActiva…

content/browser/renderer_host/render_widget_host_view_aura_unittest.cc

 // Copyright (c) 2012 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 "content/browser/renderer_host/render_widget_host_view_aura.h"
 
 #include "base/basictypes.h"
 #include "base/message_loop.h"
 #include "content/browser/renderer_host/render_widget_host_delegate.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
@@ skipping 120 matching lines @@
   aura::Window* window = view_->GetNativeView();
   ASSERT_TRUE(window != NULL);
   EXPECT_EQ(ui::SHOW_STATE_FULLSCREEN,
             window->GetProperty(aura::client::kShowStateKey));
 
   // Check that we requested and received the focus.
   EXPECT_TRUE(window->HasFocus());
 
   // Check that we'll also say it's okay to activate the window when there's an
   // ActivationClient defined.
-  EXPECT_TRUE(view_->ShouldActivate(NULL));
+  EXPECT_TRUE(view_->ShouldActivate());
 }
 
 // Checks that a fullscreen view is destroyed when it loses the focus.
 TEST_F(RenderWidgetHostViewAuraTest, DestroyFullscreenOnBlur) {
   view_->InitAsFullscreen(parent_view_);
   aura::Window* window = view_->GetNativeView();
   ASSERT_TRUE(window != NULL);
   ASSERT_TRUE(window->HasFocus());
 
   // After we create and focus another window, the RWHVA's window should be
@@ skipping 122 matching lines @@
   EXPECT_EQ(1U, view_->touch_event_.touchesLength);
   EXPECT_EQ(WebKit::WebTouchPoint::StateMoved,
             view_->touch_event_.touches[0].state);
 
   EXPECT_EQ(ui::ER_CONSUMED, view_->OnTouchEvent(&release));
   EXPECT_EQ(WebKit::WebInputEvent::TouchEnd, view_->touch_event_.type);
   EXPECT_EQ(0U, view_->touch_event_.touchesLength);
 }
 
 }  // namespace content