| Index: components/infobars/test/infobar_test.cc
|
| diff --git a/components/infobars/test/infobar_test.cc b/components/infobars/test/infobar_test.cc
|
| index b661b50842179606b9d3f19e51ff6156419e9094..6bcf3546cdaec114bb0ca4aa467f9d65dd817f0a 100644
|
| --- a/components/infobars/test/infobar_test.cc
|
| +++ b/components/infobars/test/infobar_test.cc
|
| @@ -7,23 +7,12 @@
|
| #include "components/infobars/core/confirm_infobar_delegate.h"
|
| #include "components/infobars/core/infobar.h"
|
|
|
| -// Provides definitions of static variables and functions that are declared in
|
| -// the component but defined in the embedder.
|
| +// Provides definitions of static functions that are declared in the component
|
| +// but defined in the embedder.
|
| // TODO(blundell): The component shouldn't be declaring statics that it's not
|
| // defining; instead, this information should be obtained via a client,
|
| // which can have a test implementation. crbug.com/386171
|
|
|
| -// On Android, these variables are defined in ../core/infobar_android.cc.
|
| -#if !defined(OS_ANDROID)
|
| -const int infobars::InfoBar::kSeparatorLineHeight = 1;
|
| -const int infobars::InfoBar::kDefaultArrowTargetHeight = 9;
|
| -const int infobars::InfoBar::kMaximumArrowTargetHeight = 24;
|
| -const int infobars::InfoBar::kDefaultArrowTargetHalfWidth =
|
| - kDefaultArrowTargetHeight;
|
| -const int infobars::InfoBar::kMaximumArrowTargetHalfWidth = 14;
|
| -const int infobars::InfoBar::kDefaultBarTargetHeight = 36;
|
| -#endif
|
| -
|
| // Some components' unittests exercise code that requires that
|
| // ConfirmInfoBarDelegate::CreateInfoBar() return a non-NULL infobar.
|
| scoped_ptr<infobars::InfoBar> ConfirmInfoBarDelegate::CreateInfoBar(
|
|
|