Reapply r72562 with willchan's nits + locally tested shlib fixes.

net/base/cookie_monster_unittest.cc

 // Copyright (c) 2010 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 <time.h>
 
 #include <string>
 
 #include "base/basictypes.h"
+#include "base/message_loop.h"
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/threading/platform_thread.h"
 #include "base/time.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/cookie_monster.h"
 #include "net/base/cookie_monster_store_test.h" // For CookieStore Mock
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 2147 matching lines @@
 
   ASSERT_EQ(2, counter->callback_count());
 
   cm->FlushStore(NewRunnableMethod(counter.get(), &CallbackCounter::Callback));
   MessageLoop::current()->RunAllPending();
 
   ASSERT_EQ(3, counter->callback_count());
 }
 
 }  // namespace