Add a unit test for BrowserViewLayout

chrome/browser/ui/views/frame/browser_view.cc

 // Copyright 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 "chrome/browser/ui/views/frame/browser_view.h"
 
 #include <algorithm>
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
@@ skipping 410 matching lines @@
     }
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ResizeCorner);
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserView, public:
 
-BrowserView::BrowserView(Browser* browser)
+BrowserView::BrowserView()
     : views::ClientView(NULL, NULL),
       last_focused_view_storage_id_(
           views::ViewStorage::GetInstance()->CreateStorageID()),
       frame_(NULL),
-      browser_(browser),
       top_container_(NULL),
       tabstrip_(NULL),
       toolbar_(NULL),
       window_switcher_button_(NULL),
       infobar_container_(NULL),
       contents_web_view_(NULL),
       devtools_container_(NULL),
       contents_container_(NULL),
       contents_split_(NULL),
       devtools_dock_side_(DEVTOOLS_DOCK_SIDE_BOTTOM),
       devtools_window_(NULL),
       initialized_(false),
       ignore_layout_(true),
 #if defined(OS_WIN) && !defined(USE_AURA)
       hung_window_detector_(&hung_plugin_action_),
       ticker_(0),
 #endif
       force_location_bar_focus_(false),
       immersive_mode_controller_(chrome::CreateImmersiveModeController()),
       ALLOW_THIS_IN_INITIALIZER_LIST(color_change_listener_(this)),
       ALLOW_THIS_IN_INITIALIZER_LIST(activate_modal_dialog_factory_(this)) {
-  browser_->tab_strip_model()->AddObserver(this);
 }
 
 BrowserView::~BrowserView() {
 #if defined(USE_ASH)
   // Destroy BrowserLauncherItemController early on as it listens to the
   // TabstripModel, which is destroyed by the browser.
   launcher_item_controller_.reset();
 #endif
 
   // Immersive mode may need to reparent views before they are removed/deleted.
@@ skipping 34 matching lines @@
 
   // It is possible that we were forced-closed by the native view system and
   // that tabs remain in the browser. Close any such remaining tabs.
   while (browser_->tab_strip_model()->count())
     delete browser_->tab_strip_model()->GetWebContentsAt(0);
 
   // Explicitly set browser_ to NULL.
   browser_.reset();
 }
 
+void BrowserView::Init(Browser* browser) {
+  browser_.reset(browser);
+  browser_->tab_strip_model()->AddObserver(this);
+}
+
 // static
 BrowserView* BrowserView::GetBrowserViewForNativeWindow(
     gfx::NativeWindow window) {
   views::Widget* widget = views::Widget::GetWidgetForNativeWindow(window);
   return widget ?
       reinterpret_cast<BrowserView*>(widget->GetNativeWindowProperty(
           kBrowserViewKey)) : NULL;
 }
 
 // static
@@ skipping 1393 matching lines @@
       child->Paint(canvas);
   }
 
   infobar_container_->Paint(canvas);
 }
 
 void BrowserView::ViewHierarchyChanged(bool is_add,
                                        views::View* parent,
                                        views::View* child) {
   if (!initialized_ && is_add && child == this && GetWidget()) {
-    Init();
+    InitViews();
     initialized_ = true;
   }
 }
 
 void BrowserView::ChildPreferredSizeChanged(View* child) {
   Layout();
 }
 
 void BrowserView::GetAccessibleState(ui::AccessibleViewState* state) {
   state->role = ui::AccessibilityTypes::ROLE_CLIENT;
@@ skipping 71 matching lines @@
     sender->child_at(i)->InvalidateLayout();
   SchedulePaint();
   Layout();
   return false;
 }
 
 void BrowserView::OnSysColorChange() {
   chrome::MaybeShowInvertBubbleView(browser_.get(), contents_container_);
 }
 
-void BrowserView::Init() {
+void BrowserView::InitViews() {
   GetWidget()->AddObserver(this);
 
-  SetLayoutManager(new BrowserViewLayout);
+  SetLayoutManager(new BrowserViewLayout(browser()));
   // Stow a pointer to this object onto the window handle so that we can get at
   // it later when all we have is a native view.
   GetWidget()->SetNativeWindowProperty(kBrowserViewKey, this);
 
   // Stow a pointer to the browser's profile onto the window handle so that we
   // can get it later when all we have is a native view.
   GetWidget()->SetNativeWindowProperty(Profile::kProfileKey,
                                        browser_->profile());
 
   // Initialize after |this| has a Widget and native window.
@@ skipping 572 matching lines @@
     launcher_item_controller_.reset(
         BrowserLauncherItemController::Create(browser_.get()));
   }
 #endif  // defined(USE_ASH)
 }
 
 // static
 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) {
   // Create the view and the frame. The frame will attach itself via the view
   // so we don't need to do anything with the pointer.
-  BrowserView* view = new BrowserView(browser);
+  BrowserView* view = new BrowserView();
+  view->Init(browser);
   (new BrowserFrame(view))->InitBrowserFrame();
   view->GetWidget()->non_client_view()->SetAccessibleName(
       l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
   return view;
 }
 
 void BrowserView::ShowAvatarBubble(WebContents* web_contents,
                                    const gfx::Rect& rect) {
   gfx::Point origin(rect.origin());
   views::View::ConvertPointToScreen(GetTabContentsContainerView(), &origin);
@@ skipping 103 matching lines @@
 
   Browser* modal_browser =
       chrome::FindBrowserWithWebContents(active_dialog->web_contents());
   if (modal_browser && (browser_ != modal_browser)) {
     modal_browser->window()->FlashFrame(true);
     modal_browser->window()->Activate();
   }
 
   AppModalDialogQueue::GetInstance()->ActivateModalDialog();
 }