summaryrefslogtreecommitdiffstats
path: root/ui/base
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-27 03:06:27 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-27 03:06:27 +0000
commit83afcbcc9bf7be3cdf91a4a6af573638c042a694 (patch)
treef651806f511203f05f5fe71583454852bc6be710 /ui/base
parentaf7023c1a1ff7265761522a6ecb0a46697e77fa7 (diff)
downloadchromium_src-83afcbcc9bf7be3cdf91a4a6af573638c042a694.zip
chromium_src-83afcbcc9bf7be3cdf91a4a6af573638c042a694.tar.gz
chromium_src-83afcbcc9bf7be3cdf91a4a6af573638c042a694.tar.bz2
ui: No need to typedef testing::Test in unittests.
TEST() macro should be used instead. TEST=ui_unittests R=sky@chromium.org Review URL: https://chromiumcodereview.appspot.com/10808072 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148710 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/base')
-rw-r--r--ui/base/keycodes/keyboard_code_conversion_mac.mm3
-rw-r--r--ui/base/resource/resource_bundle_win.cc2
-rw-r--r--ui/base/text/text_elider.cc2
-rw-r--r--ui/base/win/hwnd_subclass_unittest.cc11
4 files changed, 9 insertions, 9 deletions
diff --git a/ui/base/keycodes/keyboard_code_conversion_mac.mm b/ui/base/keycodes/keyboard_code_conversion_mac.mm
index 3d9e0a6..2f8c211 100644
--- a/ui/base/keycodes/keyboard_code_conversion_mac.mm
+++ b/ui/base/keycodes/keyboard_code_conversion_mac.mm
@@ -5,6 +5,7 @@
#import "ui/base/keycodes/keyboard_code_conversion_mac.h"
#include <algorithm>
+
#import <Carbon/Carbon.h>
#include "base/logging.h"
@@ -447,7 +448,7 @@ KeyboardCode KeyboardCodeFromKeyCode(unsigned short keyCode) {
return kKeyboardCodes[keyCode];
}
-} // anonymous namespace
+} // namespace
int MacKeyCodeForWindowsKeyCode(KeyboardCode keycode,
NSUInteger flags,
diff --git a/ui/base/resource/resource_bundle_win.cc b/ui/base/resource/resource_bundle_win.cc
index bba84d4..96f5409 100644
--- a/ui/base/resource/resource_bundle_win.cc
+++ b/ui/base/resource/resource_bundle_win.cc
@@ -33,7 +33,7 @@ FilePath GetResourcesPakFilePath(const std::string& pak_name) {
return FilePath(ASCIIToUTF16(pak_name));
}
-} // end anonymous namespace
+} // namespace
void ResourceBundle::LoadCommonResources() {
// As a convenience, add the current resource module as a data packs.
diff --git a/ui/base/text/text_elider.cc b/ui/base/text/text_elider.cc
index 7d7194a..b645992 100644
--- a/ui/base/text/text_elider.cc
+++ b/ui/base/text/text_elider.cc
@@ -5,7 +5,7 @@
// This file implements utility functions for eliding and formatting UI text.
//
// Note that several of the functions declared in text_elider.h are implemented
-// in this file using helper classes in the anonymous namespace.
+// in this file using helper classes in an unnamed namespace.
#include "ui/base/text/text_elider.h"
diff --git a/ui/base/win/hwnd_subclass_unittest.cc b/ui/base/win/hwnd_subclass_unittest.cc
index 814f3df..5917ef2 100644
--- a/ui/base/win/hwnd_subclass_unittest.cc
+++ b/ui/base/win/hwnd_subclass_unittest.cc
@@ -2,15 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "ui/base/win/hwnd_subclass.h"
+
#include "base/basictypes.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/base/win/window_impl.h"
-#include "ui/base/win/hwnd_subclass.h"
namespace ui {
-typedef testing::Test HWNDSubclassTest;
-
namespace {
class TestWindow : public ui::WindowImpl {
@@ -68,7 +67,7 @@ class TestMessageFilter : public HWNDMessageFilter {
} // namespace
-TEST_F(HWNDSubclassTest, Filtering) {
+TEST(HWNDSubclassTest, Filtering) {
TestWindow window;
window.Init(NULL, gfx::Rect(0, 0, 100, 100));
EXPECT_TRUE(window.hwnd() != NULL);
@@ -97,7 +96,7 @@ TEST_F(HWNDSubclassTest, Filtering) {
}
}
-TEST_F(HWNDSubclassTest, FilteringMultipleFilters) {
+TEST(HWNDSubclassTest, FilteringMultipleFilters) {
TestWindow window;
window.Init(NULL, gfx::Rect(0, 0, 100, 100));
EXPECT_TRUE(window.hwnd() != NULL);
@@ -131,7 +130,7 @@ TEST_F(HWNDSubclassTest, FilteringMultipleFilters) {
}
}
-TEST_F(HWNDSubclassTest, RemoveFilter) {
+TEST(HWNDSubclassTest, RemoveFilter) {
TestWindow window;
window.Init(NULL, gfx::Rect(0, 0, 100, 100));
EXPECT_TRUE(window.hwnd() != NULL);