Reland Merge NativeTextfieldViews into views::Textfield.

chrome/browser/ui/views/autofill/decorated_textfield_unittest.cc

Index: chrome/browser/ui/views/autofill/decorated_textfield_unittest.cc
diff --git a/chrome/browser/ui/views/autofill/decorated_textfield_unittest.cc b/chrome/browser/ui/views/autofill/decorated_textfield_unittest.cc
deleted file mode 100644
index d027dd5df06128f55e05a31487b2017a15dd4f66..0000000000000000000000000000000000000000
--- a/chrome/browser/ui/views/autofill/decorated_textfield_unittest.cc
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2014 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/strings/utf_string_conversions.h"
-#include "chrome/browser/ui/views/autofill/decorated_textfield.h"
-#include "testing/gtest/include/gtest/gtest.h"
-#include "ui/views/controls/button/label_button.h"
-
-namespace autofill {
-
-TEST(DecoratedTextfieldTest, HeightMatchesButton) {
-  DecoratedTextfield textfield(base::ASCIIToUTF16("default"),
-                               base::ASCIIToUTF16("placeholder"),
-                               NULL);
-  views::LabelButton button(NULL, base::ASCIIToUTF16("anyoldtext"));;
-  button.SetStyle(views::Button::STYLE_BUTTON);
-  EXPECT_EQ(button.GetPreferredSize().height() -
-                DecoratedTextfield::kMagicInsetNumber,
-            textfield.GetPreferredSize().height());
-}
-
-}  // namespace autofill