Extract StartupTabs and startup types from StartupBrowserCreator.

chrome/browser/profiles/avatar_menu_model.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 "chrome/browser/profiles/avatar_menu_model.h"
 
 #include "base/bind.h"
 #include "base/stl_util.h"
 #include "base/string_number_conversions.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 18 matching lines @@
 namespace {
 
 void OnProfileCreated(bool always_create,
                       Profile* profile,
                       Profile::CreateStatus status) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   if (status == Profile::CREATE_STATUS_INITIALIZED) {
     ProfileManager::FindOrCreateNewWindowForProfile(
         profile,
-        StartupBrowserCreator::IS_NOT_PROCESS_STARTUP,
-        StartupBrowserCreator::IS_NOT_FIRST_RUN,
+        browser::startup::IS_NOT_PROCESS_STARTUP,
+        browser::startup::IS_NOT_FIRST_RUN,
         always_create);
   }
 }
 
 }  // namespace
 
 AvatarMenuModel::AvatarMenuModel(ProfileInfoInterface* profile_cache,
                                  AvatarMenuModelObserver* observer,
                                  Browser* browser)
     : profile_info_(profile_cache),
@@ skipping 119 matching lines @@
       item->active = browser_->profile()->GetPath() == path;
     }
     items_.push_back(item);
   }
 }
 
 void AvatarMenuModel::ClearMenu() {
   STLDeleteContainerPointers(items_.begin(), items_.end());
   items_.clear();
 }