Cleanup for views::Label:

ui/views/controls/label_unittest.cc

 // Copyright (c) 2012 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 "base/i18n/rtl.h"
 #include "base/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/canvas.h"
@@ skipping 25 matching lines @@
   label.SetFont(font);
   gfx::Font font_used = label.font();
   EXPECT_EQ(font_name, font_used.GetFontName());
   EXPECT_EQ(30, font_used.GetFontSize());
 }
 
 TEST(LabelTest, TextProperty) {
   Label label;
   string16 test_text(ASCIIToUTF16("A random string."));
   label.SetText(test_text);
-  EXPECT_EQ(test_text, label.GetText());
+  EXPECT_EQ(test_text, label.text());
 }
 
 TEST(LabelTest, UrlProperty) {
   Label label;
   std::string my_url("http://www.orkut.com/some/Random/path");
   GURL url(my_url);
   label.SetURL(url);
-  EXPECT_EQ(my_url, label.GetURL().spec());
-  EXPECT_EQ(UTF8ToUTF16(my_url), label.GetText());
+  EXPECT_EQ(UTF8ToUTF16(my_url), label.text());
 }
 
 TEST(LabelTest, ColorProperty) {
   Label label;
   SkColor color = SkColorSetARGB(20, 40, 10, 5);
   label.SetAutoColorReadabilityEnabled(false);
   label.SetEnabledColor(color);
   EXPECT_EQ(color, label.enabled_color());
 }
 
@@ skipping 783 matching lines @@
   EXPECT_EQ(
       0, label.ComputeDrawStringFlags() & gfx::Canvas::NO_SUBPIXEL_RENDERING);
 
   label.SetBackgroundColor(SkColorSetARGB(64, 255, 255, 255));
   EXPECT_EQ(
       gfx::Canvas::NO_SUBPIXEL_RENDERING,
       label.ComputeDrawStringFlags() & gfx::Canvas::NO_SUBPIXEL_RENDERING);
 }
 
 }  // namespace views