clang: update gtest to r435 and gmock to r300.

This picks up some clang-specific fixes.
Unfortunately, the gtest update cascaded into a gmock update.
So I picked the earliest gmock version that mentioned a specific
gtest version so that they are more likely to work together.

gtest changelog:
- Fixes a leak in ThreadLocal.
- CMake 2.8/Visual Age compatibility patch by Hady Zalek.
- C++ Builder compatibility patch by Josh Kelley.
- Fixes gtest_filter_unittest and gtest_help_test on systems without death tests.
- Simplifies Makefile.am (by Zhanyong Wan and Vlad Losev).
- Adds alternative spellings for FAIL, SUCCEED, and TEST.
- Over-hauls README, and fixes Makefile.
- Fixes gtest-port_test on MinGW.
- Implements color output in GNU Screen sessions (issue 277).
- Minor improvement to hermetic build support in the CMake script, by Vlad Losev.
- Improves support for building Google Test as Windows DLL.
- Silence a Clang warning about an unused variable.
- Moves the universal printer from gmock to gtest and refactors the cmake script for reusing in gmock (by Vlad Losev).
- Suppresses some Clang warnings (by Chandler Carruth, Jeffrey Yasskin, and Zhanyong Wan).
- Renames CMake build script options.
- Lucid autotools compatibility patch by Jeffrey Yasskin.
- Replaces UniversalPrinter<T>::Print(x, os) with UniversalPrint(x, os) as appropriate (by Zhanyong Wan).
- Comment tweaks in CMakeLists.txt.
- Renames test script flags.
- Fixes a typo in comments.
- Adds GTEST_REMOVE_REFERENCE_AND_CONST_.
- Introduces gtest_force_shared_crt option for CMake build scripts.
- Implements printing parameters of failed parameterized tests (issue 71).

gmock changelog:
- Improves Makefile.am (by Vlad Losev); fixes Makefile and updates README (by Zhanyong Wan).
- Fixes a typo in README.
- Adds Each(m) (by Wojtek Moczydlowski); removes scripts/test/Makefile (by Zhanyong Wan); pulls in gtest r424.
- Adds a synchronization test.
- Fixes tests leaking altered values of GMOCK_FLAG(verbose) (issue 110).
- Moves the universal printer from gmock to gtest (by Vlad Losev).
- Renames test script flags.
- Adds CMake build script.
- Implements Pointwise().
- Fixes build failure on Windows/CMake (issue 111).
- Pulls r435 of gtest. This brings in the gtest_force_shared_crt option in CMake.

TEST=all existing tests should still pass

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

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

1 files changed, 20 insertions, 18 deletions

diff --git a/chrome/browser/notifications/desktop_notifications_unittest.cc b/chrome/browser/notifications/desktop_notifications_unittest.cc
index a03de2e9..d324b6a 100644
--- a/chrome/browser/notifications/desktop_notifications_unittest.cc
+++ b/chrome/browser/notifications/desktop_notifications_unittest.cc
@@ -269,25 +269,27 @@ TEST_F(DesktopNotificationsTest, TestQueueing) {
 
   // Cancel the notifications from the start; the balloon space should
   // remain full.
-  int id;
-  for (id = 1;
-       id <= kLotsOfToasts - balloon_collection_->max_balloon_count();
-       ++id) {
-    service_->CancelDesktopNotification(process_id, route_id, id);
-    MessageLoopForUI::current()->RunAllPending();
-    expected_log.append("notification closed by script\n");
-    expected_log.append("notification displayed\n");
-    EXPECT_EQ(balloon_collection_->max_balloon_count(),
-              balloon_collection_->count());
-    EXPECT_EQ(expected_log, log_output_);
-  }
+  {
+    int id;
+    for (id = 1;
+         id <= kLotsOfToasts - balloon_collection_->max_balloon_count();
+         ++id) {
+      service_->CancelDesktopNotification(process_id, route_id, id);
+      MessageLoopForUI::current()->RunAllPending();
+      expected_log.append("notification closed by script\n");
+      expected_log.append("notification displayed\n");
+      EXPECT_EQ(balloon_collection_->max_balloon_count(),
+                balloon_collection_->count());
+      EXPECT_EQ(expected_log, log_output_);
+    }
 
-  // Now cancel the rest.  It should empty the balloon space.
-  for (; id <= kLotsOfToasts; ++id) {
-    service_->CancelDesktopNotification(process_id, route_id, id);
-    expected_log.append("notification closed by script\n");
-    MessageLoopForUI::current()->RunAllPending();
-    EXPECT_EQ(expected_log, log_output_);
+    // Now cancel the rest.  It should empty the balloon space.
+    for (; id <= kLotsOfToasts; ++id) {
+      service_->CancelDesktopNotification(process_id, route_id, id);
+      expected_log.append("notification closed by script\n");
+      MessageLoopForUI::current()->RunAllPending();
+      EXPECT_EQ(expected_log, log_output_);
+    }
   }
 
   // Verify that the balloon collection is now empty.