Remove BubbleDelegateView::Show(); call GetWidget()->Show() instead; etc.

ui/views/widget/widget_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 "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/events/event_utils.h"
@@ skipping 1178 matching lines @@
   widget.SetContentsView(contents_view);
   widget.Show();
   widget.Activate();
   contents_view->RequestFocus();
   EXPECT_TRUE(contents_view->HasFocus());
 
   // Show a bubble.
   BubbleDelegateView* bubble_delegate_view =
       new BubbleDelegateView(contents_view, BubbleBorder::TOP_LEFT);
   bubble_delegate_view->set_focusable(true);
-  Widget* bubble_widget =
-      BubbleDelegateView::CreateBubble(bubble_delegate_view);
-  bubble_delegate_view->Show();
+  BubbleDelegateView::CreateBubble(bubble_delegate_view)->Show();
   bubble_delegate_view->RequestFocus();
 
   // |contents_view_| should no longer have focus.
   EXPECT_FALSE(contents_view->HasFocus());
   EXPECT_TRUE(bubble_delegate_view->HasFocus());
 
-  bubble_widget->CloseNow();
+  bubble_delegate_view->GetWidget()->CloseNow();
 
   // Closing the bubble should result in focus going back to the contents view.
   EXPECT_TRUE(contents_view->HasFocus());
 }
 
 // Desktop native widget Aura tests are for non Chrome OS platforms.
 #if !defined(OS_CHROMEOS)
 // This class validates whether paints are received for a visible Widget.
 // To achieve this it overrides the Show and Close methods on the Widget class
 // and sets state whether subsequent paints are expected.
@@ skipping 390 matching lines @@
   Widget::InitParams params =
       CreateParams(views::Widget::InitParams::TYPE_POPUP);
   params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   widget->Init(params);
   EXPECT_TRUE(delegate->on_before_init_called());
   EXPECT_TRUE(delegate->is_top_level());
 }
 
 }  // namespace
 }  // namespace views