Cleanup for views::Label:

chrome/browser/ui/views/location_bar/location_bar_view.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 "chrome/browser/ui/views/location_bar/location_bar_view.h"
 
 #include <algorithm>
 #include <map>
 
 #include "base/command_line.h"
@@ skipping 457 matching lines @@
     if (!suggested_text_view_) {
       suggested_text_view_ = new SuggestedTextView(location_entry_->model());
       suggested_text_view_->SetText(text);
       if (views::Widget::IsPureViews())
         NOTIMPLEMENTED();
 #if !defined(USE_AURA)
       else
         suggested_text_view_->SetFont(GetOmniboxViewWin()->GetFont());
 #endif
       AddChildView(suggested_text_view_);
-    } else if (suggested_text_view_->GetText() != text) {
+    } else if (suggested_text_view_->text() != text) {
       suggested_text_view_->SetText(text);
     }
     if (animate_to_complete && !location_entry_->IsImeComposing())
       suggested_text_view_->StartAnimation();
   } else if (suggested_text_view_) {
     delete suggested_text_view_;
     suggested_text_view_ = NULL;
   } else {
     return;
   }
 
   Layout();
   SchedulePaint();
 }
 
 string16 LocationBarView::GetInstantSuggestion() const {
-  return HasValidSuggestText() ? suggested_text_view_->GetText() : string16();
+  return HasValidSuggestText() ? suggested_text_view_->text() : string16();
 }
 #endif
 
 void LocationBarView::SetLocationEntryFocusable(bool focusable) {
   if (views::Widget::IsPureViews())
     AsViews(location_entry_.get())->SetLocationEntryFocusable(focusable);
   else
     set_focusable(focusable);
 }
 
@@ skipping 787 matching lines @@
   if (type == chrome::NOTIFICATION_PREF_CHANGED) {
     std::string* name = content::Details<std::string>(details).ptr();
     if (*name == prefs::kEditBookmarksEnabled)
       Update(NULL);
   }
 }
 
 #if defined(OS_WIN) || defined(USE_AURA)
 bool LocationBarView::HasValidSuggestText() const {
   return suggested_text_view_ && !suggested_text_view_->size().IsEmpty() &&
-      !suggested_text_view_->GetText().empty();
+      !suggested_text_view_->text().empty();
 }
 
 #if !defined(USE_AURA)
 OmniboxViewWin* LocationBarView::GetOmniboxViewWin() {
   CHECK(!views::Widget::IsPureViews());
   return static_cast<OmniboxViewWin*>(location_entry_.get());
 }
 #endif
 #endif