Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(210)

Unified Diff: chrome/browser/extensions/api/autotest_private/autotest_private_apitest.cc

Issue 13520005: autotestPrivate.loginStatus returns a dictionary instead of a string. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/api/autotest_private/autotest_private_apitest.cc
===================================================================
--- chrome/browser/extensions/api/autotest_private/autotest_private_apitest.cc (revision 192364)
+++ chrome/browser/extensions/api/autotest_private/autotest_private_apitest.cc (working copy)
@@ -6,15 +6,11 @@
#include "chrome/browser/extensions/api/autotest_private/autotest_private_api_factory.h"
#include "chrome/browser/extensions/extension_apitest.h"
-// Times out on win asan, http://crbug.com/166026
-#if defined(OS_WIN) && defined(ADDRESS_SANITIZER)
-#define MAYBE_AutotestPrivate DISABLED_AutotestPrivate
-#else
-#define MAYBE_AutotestPrivate AutotestPrivate
-#endif
-IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_AutotestPrivate) {
+#if defined(OS_CHROMEOS)
+IN_PROC_BROWSER_TEST_F(ExtensionApiTest, AutotestPrivate) {
// Turn on testing mode so we don't kill the browser.
extensions::AutotestPrivateAPIFactory::GetForProfile(
browser()->profile())->set_test_mode(true);
ASSERT_TRUE(RunComponentExtensionTest("autotest_private")) << message_;
}
+#endif

Powered by Google App Engine
This is Rietveld 408576698