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

Side by Side Diff: components/test_runner/spell_check_client.h

Issue 1852603002: Replacing most of web_task.h with base::Closure + base::WeakPtrFactory. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@move-mocks-to-test-runner
Patch Set: Fixing a test. Created 4 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
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 COMPONENTS_TEST_RUNNER_SPELL_CHECK_CLIENT_H_ 5 #ifndef COMPONENTS_TEST_RUNNER_SPELL_CHECK_CLIENT_H_
6 #define COMPONENTS_TEST_RUNNER_SPELL_CHECK_CLIENT_H_ 6 #define COMPONENTS_TEST_RUNNER_SPELL_CHECK_CLIENT_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
11 #include "base/memory/weak_ptr.h"
11 #include "components/test_runner/mock_spell_check.h" 12 #include "components/test_runner/mock_spell_check.h"
12 #include "components/test_runner/web_task.h"
13 #include "third_party/WebKit/public/platform/WebString.h" 13 #include "third_party/WebKit/public/platform/WebString.h"
14 #include "third_party/WebKit/public/platform/WebVector.h" 14 #include "third_party/WebKit/public/platform/WebVector.h"
15 #include "third_party/WebKit/public/web/WebSpellCheckClient.h" 15 #include "third_party/WebKit/public/web/WebSpellCheckClient.h"
16 16
17 namespace blink { 17 namespace blink {
18 class WebTextCheckingCompletion; 18 class WebTextCheckingCompletion;
19 struct WebTextCheckingResult; 19 struct WebTextCheckingResult;
20 } // namespace blink 20 } // namespace blink
21 21
22 namespace test_runner { 22 namespace test_runner {
23 23
24 class TestRunner; 24 class TestRunner;
25 class WebTestDelegate; 25 class WebTestDelegate;
26 26
27 class SpellCheckClient : public blink::WebSpellCheckClient { 27 class SpellCheckClient : public blink::WebSpellCheckClient {
28 public: 28 public:
29 explicit SpellCheckClient(TestRunner* test_runner); 29 explicit SpellCheckClient(TestRunner* test_runner);
30 virtual ~SpellCheckClient(); 30 virtual ~SpellCheckClient();
31 31
32 void SetDelegate(WebTestDelegate* delegate); 32 void SetDelegate(WebTestDelegate* delegate);
33 33
34 WebTaskList* mutable_task_list() { return &task_list_; }
35 MockSpellCheck* MockSpellCheckWord() { return &spell_check_; } 34 MockSpellCheck* MockSpellCheckWord() { return &spell_check_; }
36 35
37 // blink::WebSpellCheckClient implementation. 36 // blink::WebSpellCheckClient implementation.
38 void spellCheck( 37 void spellCheck(
39 const blink::WebString& text, 38 const blink::WebString& text,
40 int& offset, 39 int& offset,
41 int& length, 40 int& length,
42 blink::WebVector<blink::WebString>* optional_suggestions) override; 41 blink::WebVector<blink::WebString>* optional_suggestions) override;
43 void checkTextOfParagraph( 42 void checkTextOfParagraph(
44 const blink::WebString& text, 43 const blink::WebString& text,
45 blink::WebTextCheckingTypeMask mask, 44 blink::WebTextCheckingTypeMask mask,
46 blink::WebVector<blink::WebTextCheckingResult>* web_results) override; 45 blink::WebVector<blink::WebTextCheckingResult>* web_results) override;
47 void requestCheckingOfText( 46 void requestCheckingOfText(
48 const blink::WebString& text, 47 const blink::WebString& text,
49 const blink::WebVector<uint32_t>& markers, 48 const blink::WebVector<uint32_t>& markers,
50 const blink::WebVector<unsigned>& marker_offsets, 49 const blink::WebVector<unsigned>& marker_offsets,
51 blink::WebTextCheckingCompletion* completion) override; 50 blink::WebTextCheckingCompletion* completion) override;
52 51
53 private: 52 private:
54 void FinishLastTextCheck(); 53 void FinishLastTextCheck();
55 54
56 // The mock spellchecker used in spellCheck(). 55 // The mock spellchecker used in spellCheck().
57 MockSpellCheck spell_check_; 56 MockSpellCheck spell_check_;
58 57
59 blink::WebString last_requested_text_check_string_; 58 blink::WebString last_requested_text_check_string_;
60 blink::WebTextCheckingCompletion* last_requested_text_checking_completion_; 59 blink::WebTextCheckingCompletion* last_requested_text_checking_completion_;
61 60
62 WebTaskList task_list_;
63
64 TestRunner* test_runner_; 61 TestRunner* test_runner_;
65 WebTestDelegate* delegate_; 62 WebTestDelegate* delegate_;
66 63
64 base::WeakPtrFactory<SpellCheckClient> weak_factory_;
65
67 DISALLOW_COPY_AND_ASSIGN(SpellCheckClient); 66 DISALLOW_COPY_AND_ASSIGN(SpellCheckClient);
68 }; 67 };
69 68
70 } // namespace test_runner 69 } // namespace test_runner
71 70
72 #endif // COMPONENTS_TEST_RUNNER_SPELL_CHECK_CLIENT_H_ 71 #endif // COMPONENTS_TEST_RUNNER_SPELL_CHECK_CLIENT_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698