ShortcutManager constructor: Added DCHECK for UI thread.

chrome/browser/apps/shortcut_manager.cc

 // Copyright 2013 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/apps/shortcut_manager.h"
 
 #include "apps/pref_names.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
@@ skipping 43 matching lines @@
       extension->ShouldDisplayInAppLauncher();
 }
 
 }  // namespace
 
 AppShortcutManager::AppShortcutManager(Profile* profile)
     : profile_(profile),
       is_profile_info_cache_observer_(false),
       prefs_(profile->GetPrefs()),
       weak_factory_(this) {
+  // Use of g_browser_process requires that we are either on the UI thread, or
+  // there are no threads initialized (such as in unit tests).
+  DCHECK(
+      !content::BrowserThread::IsWellKnownThread(content::BrowserThread::UI) ||
+      content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_INSTALLED,
                  content::Source<Profile>(profile_));
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNINSTALLED,
                  content::Source<Profile>(profile_));
   // Wait for extensions to be ready before running OnceOffCreateShortcuts.
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSIONS_READY,
                  content::Source<Profile>(profile_));
 
-  // TODO(mgiuca): This use of g_browser_process should be DCHECKed for
-  // content::BrowserThread::CurrentlyOn(content::BrowserThread::UI). This check
-  // currently fails browser_tests, due to http://crbug.com/251191.
   ProfileManager* profile_manager = g_browser_process->profile_manager();
   // profile_manager might be NULL in testing environments.
   if (profile_manager) {
     profile_manager->GetProfileInfoCache().AddObserver(this);
     is_profile_info_cache_observer_ = true;
   }
 }
 
 AppShortcutManager::~AppShortcutManager() {
   if (g_browser_process && is_profile_info_cache_observer_) {
@@ skipping 97 matching lines @@
           *it->get(), profile_, base::Bind(&CreateShortcutsInApplicationsMenu));
   }
 }
 
 void AppShortcutManager::DeleteApplicationShortcuts(
     const Extension* extension) {
   ShellIntegration::ShortcutInfo delete_info =
       web_app::ShortcutInfoForExtensionAndProfile(extension, profile_);
   web_app::DeleteAllShortcuts(delete_info);
 }