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

Side by Side Diff: content/shell/renderer/test_runner/test_runner.h

Issue 566833002: Update WebTask in chromium c++ style (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: resolved build error Created 6 years, 3 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
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 #ifndef CONTENT_SHELL_RENDERER_TEST_RUNNER_TEST_RUNNER_H_ 5 #ifndef CONTENT_SHELL_RENDERER_TEST_RUNNER_TEST_RUNNER_H_
6 #define CONTENT_SHELL_RENDERER_TEST_RUNNER_TEST_RUNNER_H_ 6 #define CONTENT_SHELL_RENDERER_TEST_RUNNER_TEST_RUNNER_H_
7 7
8 #include <deque> 8 #include <deque>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
11 11
12 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
13 #include "base/memory/weak_ptr.h" 13 #include "base/memory/weak_ptr.h"
14 #include "content/shell/renderer/test_runner/WebTask.h" 14 #include "content/shell/renderer/test_runner/web_task.h"
15 #include "content/shell/renderer/test_runner/web_test_runner.h" 15 #include "content/shell/renderer/test_runner/web_test_runner.h"
16 #include "v8/include/v8.h" 16 #include "v8/include/v8.h"
17 17
18 class GURL; 18 class GURL;
19 class SkBitmap; 19 class SkBitmap;
20 20
21 namespace blink { 21 namespace blink {
22 class WebFrame; 22 class WebFrame;
23 class WebNotificationPresenter; 23 class WebNotificationPresenter;
24 class WebPermissionClient; 24 class WebPermissionClient;
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 bool is_empty() { return queue_.empty(); } 156 bool is_empty() { return queue_.empty(); }
157 WebTaskList* mutable_task_list() { return &task_list_; } 157 WebTaskList* mutable_task_list() { return &task_list_; }
158 158
159 private: 159 private:
160 void ProcessWork(); 160 void ProcessWork();
161 161
162 class WorkQueueTask : public WebMethodTask<WorkQueue> { 162 class WorkQueueTask : public WebMethodTask<WorkQueue> {
163 public: 163 public:
164 WorkQueueTask(WorkQueue* object) : WebMethodTask<WorkQueue>(object) {} 164 WorkQueueTask(WorkQueue* object) : WebMethodTask<WorkQueue>(object) {}
165 165
166 virtual void runIfValid() OVERRIDE; 166 virtual void RunIfValid() OVERRIDE;
167 }; 167 };
168 168
169 WebTaskList task_list_; 169 WebTaskList task_list_;
170 std::deque<WorkItem*> queue_; 170 std::deque<WorkItem*> queue_;
171 bool frozen_; 171 bool frozen_;
172 TestRunner* controller_; 172 TestRunner* controller_;
173 }; 173 };
174 174
175 /////////////////////////////////////////////////////////////////////////// 175 ///////////////////////////////////////////////////////////////////////////
176 // Methods dealing with the test logic 176 // Methods dealing with the test logic
(...skipping 586 matching lines...) Expand 10 before | Expand all | Expand 10 after
763 bool use_mock_theme_; 763 bool use_mock_theme_;
764 764
765 base::WeakPtrFactory<TestRunner> weak_factory_; 765 base::WeakPtrFactory<TestRunner> weak_factory_;
766 766
767 DISALLOW_COPY_AND_ASSIGN(TestRunner); 767 DISALLOW_COPY_AND_ASSIGN(TestRunner);
768 }; 768 };
769 769
770 } // namespace content 770 } // namespace content
771 771
772 #endif // CONTENT_SHELL_RENDERER_TEST_RUNNER_TEST_RUNNER_H_ 772 #endif // CONTENT_SHELL_RENDERER_TEST_RUNNER_TEST_RUNNER_H_
OLDNEW
« no previous file with comments | « content/shell/renderer/test_runner/spell_check_client.cc ('k') | content/shell/renderer/test_runner/test_runner.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698