Factor out the layout code from OpaqueBrowserFrameView for testing.

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

Index: chrome/browser/ui/views/frame/browser_non_client_frame_view.cc
diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view.cc b/chrome/browser/ui/views/frame/browser_non_client_frame_view.cc
index e5ae6d019af39ac07dbc298804dca0fb2083ce24..ef8c258cf722c0079306166d4892db08e69f3f0e 100644
--- a/chrome/browser/ui/views/frame/browser_non_client_frame_view.cc
+++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view.cc
@@ -9,6 +9,7 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_manager.h"
+#include "chrome/browser/ui/view_ids.h"
 #include "chrome/browser/ui/views/avatar_label.h"
 #include "chrome/browser/ui/views/avatar_menu_button.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
@@ -54,11 +55,13 @@ void BrowserNonClientFrameView::UpdateAvatarInfo() {
       Profile* profile = browser_view_->browser()->profile();
       if (profile->IsManaged() && !avatar_label_) {
         avatar_label_ = new AvatarLabel(browser_view_);
+        avatar_label_->set_id(VIEW_ID_AVATAR_LABEL);
         AddChildView(avatar_label_);
       }
       avatar_button_ = new AvatarMenuButton(
           browser_view_->browser(),
           browser_view_->IsOffTheRecord() && !browser_view_->IsGuestSession());
+      avatar_button_->set_id(VIEW_ID_AVATAR_BUTTON);
       AddChildView(avatar_button_);
       frame_->GetRootView()->Layout();
     }