4 files changed, 16 insertions, 20 deletions
diff --git a/ui/base/animation/multi_animation_unittest.cc b/ui/base/animation/multi_animation_unittest.cc
index 9e0c339..2c77ed7 100644
--- a/ui/base/animation/multi_animation_unittest.cc
+++ b/ui/base/animation/multi_animation_unittest.cc
@@ -8,9 +8,7 @@
 
 namespace ui {
 
-typedef testing::Test MultiAnimationTest;
-
-TEST_F(MultiAnimationTest, Basic) {
+TEST(MultiAnimationTest, Basic) {
   // Create a MultiAnimation with two parts.
   MultiAnimation::Parts parts;
   parts.push_back(MultiAnimation::Part(100, Tween::LINEAR));
@@ -38,7 +36,7 @@ TEST_F(MultiAnimationTest, Basic) {
                    animation.GetCurrentValue());
 }
 
-TEST_F(MultiAnimationTest, DifferingStartAndEnd) {
+TEST(MultiAnimationTest, DifferingStartAndEnd) {
   // Create a MultiAnimation with two parts.
   MultiAnimation::Parts parts;
   parts.push_back(MultiAnimation::Part(200, Tween::LINEAR));
@@ -61,7 +59,7 @@ TEST_F(MultiAnimationTest, DifferingStartAndEnd) {
 }
 
 // Makes sure multi-animation stops if cycles is false.
-TEST_F(MultiAnimationTest, DontCycle) {
+TEST(MultiAnimationTest, DontCycle) {
   MultiAnimation::Parts parts;
   parts.push_back(MultiAnimation::Part(200, Tween::LINEAR));
   MultiAnimation animation(parts);
@@ -77,7 +75,7 @@ TEST_F(MultiAnimationTest, DontCycle) {
 }
 
 // Makes sure multi-animation cycles correctly.
-TEST_F(MultiAnimationTest, Cycle) {
+TEST(MultiAnimationTest, Cycle) {
   MultiAnimation::Parts parts;
   parts.push_back(MultiAnimation::Part(200, Tween::LINEAR));
   MultiAnimation animation(parts);
diff --git a/ui/base/dragdrop/os_exchange_data_win_unittest.cc b/ui/base/dragdrop/os_exchange_data_win_unittest.cc
index dac0e06..0de6841 100644
--- a/ui/base/dragdrop/os_exchange_data_win_unittest.cc
+++ b/ui/base/dragdrop/os_exchange_data_win_unittest.cc
@@ -5,19 +5,17 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_handle.h"
 #include "base/memory/scoped_ptr.h"
-#include "ui/base/dragdrop/os_exchange_data.h"
-#include "ui/base/dragdrop/os_exchange_data_provider_win.h"
 #include "base/pickle.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/scoped_hglobal.h"
 #include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/clipboard/clipboard_util_win.h"
+#include "ui/base/dragdrop/os_exchange_data.h"
+#include "ui/base/dragdrop/os_exchange_data_provider_win.h"
 
 namespace ui {
 
-typedef testing::Test OSExchangeDataTest;
-
 namespace {
 
 OSExchangeData::Provider* CloneProvider(const OSExchangeData& data) {
diff --git a/ui/base/view_prop_unittest.cc b/ui/base/view_prop_unittest.cc
index 5ac45df..49046d8 100644
--- a/ui/base/view_prop_unittest.cc
+++ b/ui/base/view_prop_unittest.cc
@@ -7,17 +7,15 @@
 #include "base/memory/scoped_ptr.h"
 #include "ui/base/view_prop.h"
 
-namespace ui {
-
-typedef testing::Test ViewPropTest;
+namespace {
+const char kKey1[] = "key_1";
+const char kKey2[] = "key_2";
+}  // namespace
 
-static const char* kKey1 = "key_1";
-static const char* kKey2 = "key_2";
-
-using ui::ViewProp;
+namespace ui {
 
 // Test a handful of viewprop assertions.
-TEST_F(ViewPropTest, Basic) {
+TEST(ViewPropTest, Basic) {
   gfx::NativeView nv1 = reinterpret_cast<gfx::NativeView>(1);
   gfx::NativeView nv2 = reinterpret_cast<gfx::NativeView>(2);
 
diff --git a/ui/gfx/rect_unittest.cc b/ui/gfx/rect_unittest.cc
index bf327ef..6e99b0a 100644
--- a/ui/gfx/rect_unittest.cc
+++ b/ui/gfx/rect_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 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.
 
@@ -7,7 +7,7 @@
 #include "ui/gfx/rect.h"
 #include "ui/gfx/skia_util.h"
 
-typedef testing::Test RectTest;
+namespace ui {
 
 TEST(RectTest, Contains) {
   static const struct ContainsCase {
@@ -328,3 +328,5 @@ TEST(RectTest, ConstructAndAssign) {
   gfx::Rect test2(rect_2);
 }
 #endif
+
+}  // namespace ui