Merge NativeTextfieldViews into views::Textfield.

ui/views/accessibility/native_view_accessibility_win_unittest.cc

 // Copyright 2013 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 <oleacc.h>
 
 #include "base/win/scoped_bstr.h"
 #include "base/win/scoped_comptr.h"
 #include "base/win/scoped_variant.h"
 #include "ui/views/accessibility/native_view_accessibility.h"
@@ skipping 41 matching lines @@
   ASSERT_STREQ(L"Name", name);
 
   base::win::ScopedBstr value;
   ASSERT_EQ(S_OK, textfield_accessible->get_accValue(
       childid_self, value.Receive()));
   ASSERT_STREQ(L"Value", value);
 
   base::win::ScopedBstr new_value(L"New value");
   ASSERT_EQ(S_OK, textfield_accessible->put_accValue(childid_self, new_value));
 
-  ASSERT_STREQ(L"New value", textfield->text().c_str());
+  ASSERT_STREQ(L"New value", textfield->GetText().c_str());
 }
 
 TEST_F(NativeViewAcccessibilityWinTest, UnattachedWebView) {
   // This is a regression test. Calling get_accChild on the native accessible
   // object for a WebView with no attached WebContents was causing an
   // infinite loop and crash. This test simulates that with an ordinary
   // View that registers itself as a web view with NativeViewAcccessibility.
 
   Widget widget;
   Widget::InitParams init_params =
@@ skipping 42 matching lines @@
   owned_widget.Init(owned_init_params);
   owned_widget.Show();
 
   ASSERT_EQ(S_OK, root_view_accessible->get_accChildCount(&child_count));
   ASSERT_EQ(2L, child_count);
 }
 #endif
 
 }  // namespace test
 }  // namespace views