Fix racing condition that blocks profiles menu showing up

Chrome should show profiles menu when "enable-udd-profiles" is supplied
on command line. This is broken while refactoring app menu code from
ToolbarView into AppMenuModel. Previously, the profile submenu model is
kept in ToolbarView and profiles menu would show up on 2nd time app menu
showing up. After the refactoring, profile menu is moved into
AppMenuModel, which is re-created everytime before we show app menu. In
AppMenuModel, it requests profiles data from GetProfilesHelper which
will later invoke OnGetProfilesDone. However, app menu is created on the
UI thread and blocks the callback until it shows up. This makes the
profiles mneu empty.
The fix is to leverage an existing profile list in BrowserProcess. When
"enable-udd-profiles" is on, BrowserInit will get the initial profile
list and NewProfileDialog will refresh it if user creates new profile.
And AppMenuModel just use the list to populate the profile menu.

BUG=30417
TEST=Verify profiles menu exists when "enable-udd-profiles" is on command line for issue 30417.

Review URL: http://codereview.chromium.org/503062

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35166 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 8 insertions, 8 deletions

diff --git a/chrome/browser/app_menu_model.cc b/chrome/browser/app_menu_model.cc
index 5cd69f3..020e1b1 100644
--- a/chrome/browser/app_menu_model.cc
+++ b/chrome/browser/app_menu_model.cc
@@ -18,14 +18,11 @@
 AppMenuModel::AppMenuModel(menus::SimpleMenuModel::Delegate* delegate,
                            Browser* browser)
     : menus::SimpleMenuModel(delegate),
-      ALLOW_THIS_IN_INITIALIZER_LIST(
-          profiles_helper_(new GetProfilesHelper(this))),
       browser_(browser) {
   Build();
 }
 
 AppMenuModel::~AppMenuModel() {
-  profiles_helper_->OnDelegateDeleted();
 }
 
 void AppMenuModel::Build() {
@@ -37,9 +34,12 @@ void AppMenuModel::Build() {
   // done.  See OnGetProfilesDone().
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   if (command_line.HasSwitch(switches::kEnableUserDataDirProfiles)) {
+    // Triggers profile list refresh in case it's changed.
+    UserDataManager::Get()->RefreshUserDataDirProfiles();
+
     if (!profiles_menu_contents_.get()) {
-      profiles_helper_->GetProfiles(NULL);
       profiles_menu_contents_.reset(new menus::SimpleMenuModel(delegate()));
+      BuildProfileSubMenu();
     }
     AddSubMenuWithStringId(IDS_PROFILE_MENU, profiles_menu_contents_.get());
   }
@@ -92,14 +92,14 @@ void AppMenuModel::Build() {
   }
 }
 
-void AppMenuModel::OnGetProfilesDone(
-    const std::vector<std::wstring>& profiles) {
+void AppMenuModel::BuildProfileSubMenu() {
   // Nothing to do if the menu has gone away.
   if (!profiles_menu_contents_.get())
     return;
 
-  // Store the latest list of profiles in the browser.
-  browser_->set_user_data_dir_profiles(profiles);
+  // Use the list of profiles in the browser.
+  const std::vector<std::wstring>& profiles =
+      browser_->user_data_dir_profiles();
 
   // Add direct submenu items for profiles.
   std::vector<std::wstring>::const_iterator iter = profiles.begin();