Even more test cleanup. Some fixes to non-test code.

chrome/test/bookmark_load_observer.h

Index: chrome/test/bookmark_load_observer.h
diff --git a/chrome/test/bookmark_load_observer.h b/chrome/test/bookmark_load_observer.h
index cf3de21b49224c392bfb48780cb9f82e1fdfbb22..0d08410ae935a19cc319469b058758b890e9529e 100644
--- a/chrome/test/bookmark_load_observer.h
+++ b/chrome/test/bookmark_load_observer.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -6,7 +6,6 @@
 #define CHROME_TEST_BOOKMARK_LOAD_OBSERVER_H_
 #pragma once
 
-#include "base/message_loop.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 
 // BookmarkLoadObserver is used when blocking until the BookmarkModel
@@ -14,10 +13,9 @@
 // loop is quit.
 class BookmarkLoadObserver : public BookmarkModelObserver {
  public:
-  BookmarkLoadObserver() {}
-  virtual void Loaded(BookmarkModel* model) {
-    MessageLoop::current()->Quit();
-  }
+  BookmarkLoadObserver();
+  virtual ~BookmarkLoadObserver();
+  virtual void Loaded(BookmarkModel* model);
 
   virtual void BookmarkNodeMoved(BookmarkModel* model,
     const BookmarkNode* old_parent,