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

Side by Side Diff: chrome/browser/ui/webui/web_ui_test_handler.cc

Issue 687903003: Cleanup: Remove unneeded ui_test_utils.h includes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix cros Created 6 years, 1 month 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "chrome/browser/ui/webui/web_ui_test_handler.h" 5 #include "chrome/browser/ui/webui/web_ui_test_handler.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "base/values.h" 10 #include "base/values.h"
11 #include "chrome/common/render_messages.h" 11 #include "chrome/common/render_messages.h"
12 #include "chrome/test/base/ui_test_utils.h"
13 #include "content/public/browser/notification_details.h" 12 #include "content/public/browser/notification_details.h"
14 #include "content/public/browser/notification_registrar.h" 13 #include "content/public/browser/notification_registrar.h"
15 #include "content/public/browser/notification_types.h" 14 #include "content/public/browser/notification_types.h"
16 #include "content/public/browser/render_frame_host.h" 15 #include "content/public/browser/render_frame_host.h"
17 #include "content/public/browser/render_view_host.h" 16 #include "content/public/browser/render_view_host.h"
18 #include "content/public/browser/web_contents.h" 17 #include "content/public/browser/web_contents.h"
19 #include "content/public/browser/web_ui.h" 18 #include "content/public/browser/web_ui.h"
19 #include "content/public/test/test_utils.h"
20 #include "testing/gtest/include/gtest/gtest.h"
20 21
21 using content::RenderViewHost; 22 using content::RenderViewHost;
22 23
23 WebUITestHandler::WebUITestHandler() 24 WebUITestHandler::WebUITestHandler()
24 : test_done_(false), 25 : test_done_(false),
25 test_succeeded_(false), 26 test_succeeded_(false),
26 run_test_done_(false), 27 run_test_done_(false),
27 run_test_succeeded_(false), 28 run_test_succeeded_(false),
28 is_waiting_(false) { 29 is_waiting_(false) {
29 } 30 }
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 // complete. 106 // complete.
106 if (!run_test_done_ || (run_test_succeeded_ && !test_done_)) { 107 if (!run_test_done_ || (run_test_succeeded_ && !test_done_)) {
107 content::RunMessageLoop(); 108 content::RunMessageLoop();
108 } 109 }
109 110
110 is_waiting_ = false; 111 is_waiting_ = false;
111 112
112 // To succeed the test must execute as well as pass the test. 113 // To succeed the test must execute as well as pass the test.
113 return run_test_succeeded_ && test_succeeded_; 114 return run_test_succeeded_ && test_succeeded_;
114 } 115 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/downloads_dom_handler_browsertest.cc ('k') | chrome/test/base/in_process_browser_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698