| Index: chrome/browser/ui/toolbar/toolbar_model_unittest.cc
|
| diff --git a/chrome/browser/ui/toolbar/toolbar_model_unittest.cc b/chrome/browser/ui/toolbar/toolbar_model_unittest.cc
|
| index 4963fb442a9a8316b42830868c03674d167c1b56..a75ae95f5b770667db36c5905465b4c6e939c736 100644
|
| --- a/chrome/browser/ui/toolbar/toolbar_model_unittest.cc
|
| +++ b/chrome/browser/ui/toolbar/toolbar_model_unittest.cc
|
| @@ -141,7 +141,7 @@ class ToolbarModelTest : public BrowserWithTestWindowTest {
|
| public:
|
| ToolbarModelTest();
|
| ToolbarModelTest(Browser::Type browser_type,
|
| - chrome::HostDesktopType host_desktop_type,
|
| + ui::HostDesktopType host_desktop_type,
|
| bool hosted_app);
|
| ~ToolbarModelTest() override;
|
|
|
| @@ -163,14 +163,10 @@ class ToolbarModelTest : public BrowserWithTestWindowTest {
|
| ToolbarModelTest::ToolbarModelTest() {
|
| }
|
|
|
| -ToolbarModelTest::ToolbarModelTest(
|
| - Browser::Type browser_type,
|
| - chrome::HostDesktopType host_desktop_type,
|
| - bool hosted_app)
|
| - : BrowserWithTestWindowTest(browser_type,
|
| - host_desktop_type,
|
| - hosted_app) {
|
| -}
|
| +ToolbarModelTest::ToolbarModelTest(Browser::Type browser_type,
|
| + ui::HostDesktopType host_desktop_type,
|
| + bool hosted_app)
|
| + : BrowserWithTestWindowTest(browser_type, host_desktop_type, hosted_app) {}
|
|
|
| ToolbarModelTest::~ToolbarModelTest() {
|
| }
|
| @@ -233,10 +229,9 @@ class PopupToolbarModelTest : public ToolbarModelTest {
|
| };
|
|
|
| PopupToolbarModelTest::PopupToolbarModelTest()
|
| - : ToolbarModelTest(Browser::TYPE_POPUP,
|
| - chrome::HOST_DESKTOP_TYPE_NATIVE,
|
| - false) {
|
| -}
|
| + : ToolbarModelTest(Browser::TYPE_POPUP,
|
| + ui::HOST_DESKTOP_TYPE_NATIVE,
|
| + false) {}
|
|
|
| PopupToolbarModelTest::~PopupToolbarModelTest() {
|
| }
|
|
|