Change DCHECK in BookmarkBarGtk to DLOG and return.

If the BookmarkBarNode isn't loaded (yet) then we shouldn't be creating any bookmark buttons.  This fixes the crashes reported in ExtensionInstallUIBrowserTest.

BUG=44548
TEST=browser_tests, unit_tests, trybots

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

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

2 files changed, 2 insertions, 6 deletions

diff --git a/chrome/browser/extensions/extension_install_ui_browsertest.cc b/chrome/browser/extensions/extension_install_ui_browsertest.cc
index a643be9..465b189 100644
--- a/chrome/browser/extensions/extension_install_ui_browsertest.cc
+++ b/chrome/browser/extensions/extension_install_ui_browsertest.cc
@@ -34,9 +34,8 @@ class ExtensionInstallUIBrowserTest : public ExtensionBrowserTest {
   }
 };
 
-// Crashy, http://crbug.com/44548.
 IN_PROC_BROWSER_TEST_F(ExtensionInstallUIBrowserTest,
-                       DISABLED_TestThemeInstallUndoResetsToDefault) {
+                       TestThemeInstallUndoResetsToDefault) {
   // Install theme once and undo to verify we go back to default theme.
   FilePath theme_path = test_data_dir_.AppendASCII("theme.crx");
   ASSERT_TRUE(InstallExtensionWithUI(theme_path, 1));
diff --git a/chrome/browser/ui/gtk/bookmark_bar_gtk.cc b/chrome/browser/ui/gtk/bookmark_bar_gtk.cc
index 97faad8..6e76c1e 100644
--- a/chrome/browser/ui/gtk/bookmark_bar_gtk.cc
+++ b/chrome/browser/ui/gtk/bookmark_bar_gtk.cc
@@ -805,14 +805,11 @@ void BookmarkBarGtk::Observe(NotificationType type,
                              const NotificationSource& source,
                              const NotificationDetails& details) {
   if (type == NotificationType::BROWSER_THEME_CHANGED) {
-    if (model_) {
+    if (model_ && model_->IsLoaded()) {
       // Regenerate the bookmark bar with all new objects with their theme
       // properties set correctly for the new theme.
       RemoveAllBookmarkButtons();
       CreateAllBookmarkButtons();
-    } else {
-      DLOG(ERROR) << "Received a theme change notification while we "
-                  << "don't have a BookmarkModel. Taking no action.";
     }
 
     UpdateEventBoxPaintability();