| Index: chrome/browser/web_applications/web_app_unittest.cc
|
| diff --git a/chrome/browser/web_applications/web_app_unittest.cc b/chrome/browser/web_applications/web_app_unittest.cc
|
| index 6377c16b589eda2964d0f128fae42edffbfeb3b9..b75640ecb4823944dae2397ed0f832340689ce83 100644
|
| --- a/chrome/browser/web_applications/web_app_unittest.cc
|
| +++ b/chrome/browser/web_applications/web_app_unittest.cc
|
| @@ -7,31 +7,32 @@
|
| #include "base/files/file_path.h"
|
| #include "base/strings/string_util.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| -#include "chrome/browser/extensions/tab_helper.h"
|
| -#include "chrome/browser/favicon/favicon_tab_helper.h"
|
| #include "chrome/browser/web_applications/web_app.h"
|
| #include "chrome/common/extensions/chrome_extension_messages.h"
|
| #include "chrome/test/base/chrome_render_view_host_test_harness.h"
|
| #include "content/public/test/test_renderer_host.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| +#if defined(TOOLKIT_VIEWS)
|
| +#include "chrome/browser/extensions/tab_helper.h"
|
| +#include "chrome/browser/favicon/favicon_tab_helper.h"
|
| +#endif
|
| +
|
| using content::RenderViewHostTester;
|
|
|
| class WebApplicationTest : public ChromeRenderViewHostTestHarness {
|
| protected:
|
| virtual void SetUp() OVERRIDE {
|
| ChromeRenderViewHostTestHarness::SetUp();
|
| +#if defined(TOOLKIT_VIEWS)
|
| extensions::TabHelper::CreateForWebContents(web_contents());
|
| FaviconTabHelper::CreateForWebContents(web_contents());
|
| +#endif
|
| }
|
| };
|
|
|
| -#if defined(OS_MACOSX)
|
| -#define MAYBE_GetShortcutInfoForTab DISABLED_GetShortcutInfoForTab
|
| -#else
|
| -#define MAYBE_GetShortcutInfoForTab GetShortcutInfoForTab
|
| -#endif
|
| -TEST_F(WebApplicationTest, MAYBE_GetShortcutInfoForTab) {
|
| +#if defined(TOOLKIT_VIEWS)
|
| +TEST_F(WebApplicationTest, GetShortcutInfoForTab) {
|
| const base::string16 title = base::ASCIIToUTF16("TEST_TITLE");
|
| const base::string16 description = base::ASCIIToUTF16("TEST_DESCRIPTION");
|
| const GURL url("http://www.foo.com/bar");
|
| @@ -50,6 +51,7 @@ TEST_F(WebApplicationTest, MAYBE_GetShortcutInfoForTab) {
|
| EXPECT_EQ(description, info.description);
|
| EXPECT_EQ(url, info.url);
|
| }
|
| +#endif
|
|
|
| TEST_F(WebApplicationTest, AppDirWithId) {
|
| base::FilePath profile_path(FILE_PATH_LITERAL("profile"));
|
|
|