Convert location bar bubble delegates to bubble dialog delegates

ui/views/view_unittest.cc

Index: ui/views/view_unittest.cc
diff --git a/ui/views/view_unittest.cc b/ui/views/view_unittest.cc
index 76b9950f7e24a2dcc9b53372decada0c56944e9e..95c93a994e8f42de7c410bfff9e42235e3f7637c 100644
--- a/ui/views/view_unittest.cc
+++ b/ui/views/view_unittest.cc
@@ -2109,7 +2109,8 @@ TEST_F(ViewTest, HandleAccelerator) {
   TestView* view = new TestView();
   view->Reset();
   view->AddAccelerator(return_accelerator);
-  EXPECT_EQ(view->accelerator_count_map_[return_accelerator], 0);
+  EXPECT_EQ(0, view->accelerator_count_map_[return_accelerator]);
+  EXPECT_FALSE(view->HandlesAccelerator(return_accelerator));
 
   // Create a window and add the view as its child.
   scoped_ptr<Widget> widget(new Widget);
@@ -2137,6 +2138,7 @@ TEST_F(ViewTest, HandleAccelerator) {
   EXPECT_TRUE(widget->IsActive());
   EXPECT_TRUE(focus_manager->ProcessAccelerator(return_accelerator));
   EXPECT_EQ(1, view->accelerator_count_map_[return_accelerator]);
+  EXPECT_TRUE(view->HandlesAccelerator(return_accelerator));
 
   // Add a child view associated with a child widget.
   TestView* child_view = new TestView();
@@ -2162,6 +2164,8 @@ TEST_F(ViewTest, HandleAccelerator) {
   EXPECT_TRUE(child_focus_manager->ProcessAccelerator(return_accelerator));
   EXPECT_EQ(1, child_view->accelerator_count_map_[return_accelerator]);
   EXPECT_EQ(0, view->accelerator_count_map_[return_accelerator]);
+  EXPECT_TRUE(child_view->HandlesAccelerator(return_accelerator));
+  EXPECT_TRUE(view->HandlesAccelerator(return_accelerator));
 
 #if defined(USE_AURA) && !defined(OS_CHROMEOS)
   // When a child view is not in focus, its parent should handle accelerators.
@@ -2172,6 +2176,8 @@ TEST_F(ViewTest, HandleAccelerator) {
   EXPECT_TRUE(child_focus_manager->ProcessAccelerator(return_accelerator));
   EXPECT_EQ(0, child_view->accelerator_count_map_[return_accelerator]);
   EXPECT_EQ(1, view->accelerator_count_map_[return_accelerator]);
+  EXPECT_FALSE(child_view->HandlesAccelerator(return_accelerator));
+  EXPECT_TRUE(view->HandlesAccelerator(return_accelerator));
 #endif
 }