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

Side by Side Diff: content/browser/webui/web_ui_mojo_browsertest.cc

Issue 247573010: Reenable WebUIMojoTest.EndToEnd{Ping,Echo} on ASAN. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: "rebased" Created 6 years, 8 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <limits> 5 #include <limits>
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/file_util.h" 8 #include "base/file_util.h"
9 #include "base/files/file_path.h" 9 #include "base/files/file_path.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
(...skipping 300 matching lines...) Expand 10 before | Expand all | Expand 10 after
311 } 311 }
312 312
313 TestWebUIControllerFactory* factory() { return &factory_; } 313 TestWebUIControllerFactory* factory() { return &factory_; }
314 314
315 private: 315 private:
316 TestWebUIControllerFactory factory_; 316 TestWebUIControllerFactory factory_;
317 317
318 DISALLOW_COPY_AND_ASSIGN(WebUIMojoTest); 318 DISALLOW_COPY_AND_ASSIGN(WebUIMojoTest);
319 }; 319 };
320 320
321 // Temporarily disabled due to memory leaks. http://crbug.com/360081
322 // Temporarily disabled due to flakiness on Windows. http://crbug.com/366644 321 // Temporarily disabled due to flakiness on Windows. http://crbug.com/366644
323 #if defined(LEAK_SANITIZER) || defined(OS_WIN) 322 #if defined(OS_WIN)
324 #define MAYBE_EndToEndPing DISABLED_EndToEndPing 323 #define MAYBE_EndToEndPing DISABLED_EndToEndPing
325 #define MAYBE_EndToEndEcho DISABLED_EndToEndEcho 324 #define MAYBE_EndToEndEcho DISABLED_EndToEndEcho
326 #else 325 #else
327 #define MAYBE_EndToEndPing EndToEndPing 326 #define MAYBE_EndToEndPing EndToEndPing
328 #define MAYBE_EndToEndEcho EndToEndEcho 327 #define MAYBE_EndToEndEcho EndToEndEcho
329 #endif 328 #endif
330 329
331 // Loads a webui page that contains mojo bindings and verifies a message makes 330 // Loads a webui page that contains mojo bindings and verifies a message makes
332 // it from the browser to the page and back. 331 // it from the browser to the page and back.
333 IN_PROC_BROWSER_TEST_F(WebUIMojoTest, MAYBE_EndToEndPing) { 332 IN_PROC_BROWSER_TEST_F(WebUIMojoTest, MAYBE_EndToEndPing) {
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
375 factory()->set_run_loop(&run_loop); 374 factory()->set_run_loop(&run_loop);
376 GURL test_url(test_server()->GetURL("files/web_ui_mojo.html?echo")); 375 GURL test_url(test_server()->GetURL("files/web_ui_mojo.html?echo"));
377 NavigateToURL(shell(), test_url); 376 NavigateToURL(shell(), test_url);
378 // RunLoop is quit when response received from page. 377 // RunLoop is quit when response received from page.
379 run_loop.Run(); 378 run_loop.Run();
380 EXPECT_EQ(kExpectedMessageCount, message_count); 379 EXPECT_EQ(kExpectedMessageCount, message_count);
381 } 380 }
382 381
383 } // namespace 382 } // namespace
384 } // namespace content 383 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698