summaryrefslogtreecommitdiffstats
path: root/chrome/test/memory_test
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-30 08:15:31 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-30 08:15:31 +0000
commit82df52ead5f3e27ac2c745b89c3d4e7475d54918 (patch)
tree0203f2bcc6ec0d20c24437b763f3aad1bf9ea863 /chrome/test/memory_test
parent228cb40ea43f32a355844adf3ef0602439aeecc3 (diff)
downloadchromium_src-82df52ead5f3e27ac2c745b89c3d4e7475d54918.zip
chromium_src-82df52ead5f3e27ac2c745b89c3d4e7475d54918.tar.gz
chromium_src-82df52ead5f3e27ac2c745b89c3d4e7475d54918.tar.bz2
Revert "[Third time landing] Python implementation of sync server, for testing."
This broke the memory waterfall, failed to import protobuf. TBR=nick Review URL: http://codereview.chromium.org/1822001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46048 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/memory_test')
-rw-r--r--chrome/test/memory_test/memory_test.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/test/memory_test/memory_test.cc b/chrome/test/memory_test/memory_test.cc
index 079e0a4..ef1eebc 100644
--- a/chrome/test/memory_test/memory_test.cc
+++ b/chrome/test/memory_test/memory_test.cc
@@ -143,7 +143,7 @@ class MemoryTest : public UITest {
int expected_tab_count = 1;
for (unsigned counter = 0; counter < urls_length; ++counter) {
std::string url = urls[counter];
-
+
SCOPED_TRACE(url);
if (url == "<PAUSE>") { // Special command to delay on this page