summaryrefslogtreecommitdiffstats
path: root/chrome/browser/safe_browsing/safe_browsing_test.cc
diff options
context:
space:
mode:
authormattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-28 07:14:19 +0000
committermattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-28 07:14:19 +0000
commit480d8870bb4a007c2816a643106fecec96abe394 (patch)
tree32c2810fa54a767911c602316368138b33cd476a /chrome/browser/safe_browsing/safe_browsing_test.cc
parent84868e93da318ebae5d5264a91d84e12efd036d1 (diff)
downloadchromium_src-480d8870bb4a007c2816a643106fecec96abe394.zip
chromium_src-480d8870bb4a007c2816a643106fecec96abe394.tar.gz
chromium_src-480d8870bb4a007c2816a643106fecec96abe394.tar.bz2
Hack around testserver issues with stdout and stderr on Win XP bots.
Re-enable python unbuffered output on win. Re-enable SafeBrowsingServerTest. BUG=96459,147368 Review URL: https://chromiumcodereview.appspot.com/11316039 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@169876 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/safe_browsing/safe_browsing_test.cc')
-rw-r--r--chrome/browser/safe_browsing/safe_browsing_test.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/chrome/browser/safe_browsing/safe_browsing_test.cc b/chrome/browser/safe_browsing/safe_browsing_test.cc
index 692aa0c..cad8262 100644
--- a/chrome/browser/safe_browsing/safe_browsing_test.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_test.cc
@@ -438,9 +438,8 @@ class SafeBrowsingServerTestHelper
DISALLOW_COPY_AND_ASSIGN(SafeBrowsingServerTestHelper);
};
-// See http://crbug.com/96459
IN_PROC_BROWSER_TEST_F(SafeBrowsingServerTest,
- DISABLED_SafeBrowsingServerTest) {
+ SafeBrowsingServerTest) {
LOG(INFO) << "Start test";
ASSERT_TRUE(InitSafeBrowsingService());