Reland Merge NativeTextfieldViews into views::Textfield.

ui/views/widget/widget.h

 // 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.
 
 #ifndef UI_VIEWS_WIDGET_WIDGET_H_
 #define UI_VIEWS_WIDGET_WIDGET_H_
 
 #include <set>
 #include <stack>
 #include <vector>
@@ skipping 739 matching lines @@
   // TODO(beng): Investigate whether or not this is needed.
   virtual internal::RootView* CreateRootView();
 
   // Provided to allow the NativeWidget implementations to destroy the RootView
   // _before_ the focus manager/tooltip manager.
   // TODO(beng): remove once we fold those objects onto this one.
   void DestroyRootView();
 
  private:
   friend class ComboboxTest;
-  friend class NativeTextfieldViewsTest;
+  friend class TextfieldTest;
 
   // Sets the value of |disable_inactive_rendering_|. If the value changes,
   // both the NonClientView and WidgetDelegate are notified.
   void SetInactiveRenderingDisabled(bool value);
 
   // Persists the window's restored position and "show" state using the
   // window delegate.
   void SaveWindowPlacement();
 
   // Sizes and positions the window just after it is created.
@@ skipping 115 matching lines @@
   // True when window movement via mouse interaction with the frame should be
   // disabled.
   bool movement_disabled_;
 
   DISALLOW_COPY_AND_ASSIGN(Widget);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_WIDGET_WIDGET_H_