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

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

Issue 8986007: Move WebUIMessageHandler to its own file in the public directory and put it in the content namesp... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 8 years, 11 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 | « chrome/browser/ui/webui/web_ui_test_handler.h ('k') | chrome/browser/ui/webui/workers_ui.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/utf_string_conversions.h" 9 #include "base/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" 12 #include "chrome/test/base/ui_test_utils.h"
13 #include "content/browser/renderer_host/render_view_host.h" 13 #include "content/browser/renderer_host/render_view_host.h"
14 #include "content/browser/webui/web_ui.h"
14 #include "content/public/browser/notification_details.h" 15 #include "content/public/browser/notification_details.h"
15 #include "content/public/browser/notification_registrar.h" 16 #include "content/public/browser/notification_registrar.h"
16 #include "content/public/browser/notification_types.h" 17 #include "content/public/browser/notification_types.h"
17 #include "content/public/browser/web_contents.h" 18 #include "content/public/browser/web_contents.h"
18 19
19 WebUITestHandler::WebUITestHandler() 20 WebUITestHandler::WebUITestHandler()
20 : test_done_(false), 21 : test_done_(false),
21 test_succeeded_(false), 22 test_succeeded_(false),
22 run_test_done_(false), 23 run_test_done_(false),
23 run_test_succeeded_(false), 24 run_test_succeeded_(false),
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 // complete. 110 // complete.
110 if (!run_test_done_ || (run_test_succeeded_ && !test_done_)) { 111 if (!run_test_done_ || (run_test_succeeded_ && !test_done_)) {
111 ui_test_utils::RunMessageLoop(); 112 ui_test_utils::RunMessageLoop();
112 } 113 }
113 114
114 is_waiting_ = false; 115 is_waiting_ = false;
115 116
116 // To succeed the test must execute as well as pass the test. 117 // To succeed the test must execute as well as pass the test.
117 return run_test_succeeded_ && test_succeeded_; 118 return run_test_succeeded_ && test_succeeded_;
118 } 119 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/web_ui_test_handler.h ('k') | chrome/browser/ui/webui/workers_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698