| Index: chrome/browser/extensions/api/page_capture/page_capture_apitest.cc
|
| diff --git a/chrome/browser/extensions/api/page_capture/page_capture_apitest.cc b/chrome/browser/extensions/api/page_capture/page_capture_apitest.cc
|
| index 34e76542bc3caea7c2bcb1b587f8c80e5b47454c..a2bb28b47cb4ff2890bfc4d88bd2815e130c8296 100644
|
| --- a/chrome/browser/extensions/api/page_capture/page_capture_apitest.cc
|
| +++ b/chrome/browser/extensions/api/page_capture/page_capture_apitest.cc
|
| @@ -18,23 +18,8 @@ class ExtensionPageCaptureApiTest : public ExtensionApiTest {
|
| ExtensionApiTest::SetUpCommandLine(command_line);
|
| command_line->AppendSwitchASCII(switches::kJavaScriptFlags, "--expose-gc");
|
| }
|
| -
|
| - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
|
| - ExtensionApiTest::SetUpInProcessBrowserTestFixture();
|
| -
|
| - host_resolver()->AddRule("www.a.com", "127.0.0.1");
|
| -
|
| - ASSERT_TRUE(StartTestServer());
|
| - }
|
| };
|
|
|
| -// Disabled on Linux http://crbug.com/98194
|
| -#if defined(OS_LINUX)
|
| -#define MAYBE_SaveAsMHTML DISABLED_SaveAsMHTML
|
| -#else
|
| -#define MAYBE_SaveAsMHTML SaveAsMHTML
|
| -#endif // defined(OS_LINUX)
|
| -
|
| class PageCaptureSaveAsMHTMLDelegate
|
| : public PageCaptureSaveAsMHTMLFunction::TestDelegate {
|
| public:
|
| @@ -54,7 +39,9 @@ class PageCaptureSaveAsMHTMLDelegate
|
| base::FilePath temp_file_;
|
| };
|
|
|
| -IN_PROC_BROWSER_TEST_F(ExtensionPageCaptureApiTest, MAYBE_SaveAsMHTML) {
|
| +IN_PROC_BROWSER_TEST_F(ExtensionPageCaptureApiTest, SaveAsMHTML) {
|
| + host_resolver()->AddRule("www.a.com", "127.0.0.1");
|
| + ASSERT_TRUE(StartEmbeddedTestServer());
|
| PageCaptureSaveAsMHTMLDelegate delegate;
|
| ASSERT_TRUE(RunExtensionTest("page_capture")) << message_;
|
| ASSERT_FALSE(delegate.temp_file_.empty());
|
|
|