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

Side by Side Diff: chrome/test/chromedriver/chrome/javascript_dialog_manager_unittest.cc

Issue 637933002: Replace FINAL and OVERRIDE with their C++11 counterparts in chrome/test (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 <string> 5 #include <string>
6 6
7 #include "base/callback.h" 7 #include "base/callback.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/values.h" 9 #include "base/values.h"
10 #include "chrome/test/chromedriver/chrome/javascript_dialog_manager.h" 10 #include "chrome/test/chromedriver/chrome/javascript_dialog_manager.h"
(...skipping 15 matching lines...) Expand all
26 26
27 class RecorderDevToolsClient : public StubDevToolsClient { 27 class RecorderDevToolsClient : public StubDevToolsClient {
28 public: 28 public:
29 RecorderDevToolsClient() {} 29 RecorderDevToolsClient() {}
30 virtual ~RecorderDevToolsClient() {} 30 virtual ~RecorderDevToolsClient() {}
31 31
32 // Overridden from StubDevToolsClient: 32 // Overridden from StubDevToolsClient:
33 virtual Status SendCommandAndGetResult( 33 virtual Status SendCommandAndGetResult(
34 const std::string& method, 34 const std::string& method,
35 const base::DictionaryValue& params, 35 const base::DictionaryValue& params,
36 scoped_ptr<base::DictionaryValue>* result) OVERRIDE { 36 scoped_ptr<base::DictionaryValue>* result) override {
37 method_ = method; 37 method_ = method;
38 params_.Clear(); 38 params_.Clear();
39 params_.MergeDictionary(&params); 39 params_.MergeDictionary(&params);
40 return Status(kOk); 40 return Status(kOk);
41 } 41 }
42 42
43 std::string method_; 43 std::string method_;
44 base::DictionaryValue params_; 44 base::DictionaryValue params_;
45 }; 45 };
46 46
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 virtual ~FakeDevToolsClient() {} 102 virtual ~FakeDevToolsClient() {}
103 103
104 void set_closing_count(int closing_count) { 104 void set_closing_count(int closing_count) {
105 closing_count_ = closing_count; 105 closing_count_ = closing_count;
106 } 106 }
107 107
108 // Overridden from StubDevToolsClient: 108 // Overridden from StubDevToolsClient:
109 virtual Status SendCommandAndGetResult( 109 virtual Status SendCommandAndGetResult(
110 const std::string& method, 110 const std::string& method,
111 const base::DictionaryValue& params, 111 const base::DictionaryValue& params,
112 scoped_ptr<base::DictionaryValue>* result) OVERRIDE { 112 scoped_ptr<base::DictionaryValue>* result) override {
113 while (closing_count_ > 0) { 113 while (closing_count_ > 0) {
114 base::DictionaryValue empty; 114 base::DictionaryValue empty;
115 Status status = 115 Status status =
116 listener_->OnEvent(this, "Page.javascriptDialogClosing", empty); 116 listener_->OnEvent(this, "Page.javascriptDialogClosing", empty);
117 if (status.IsError()) 117 if (status.IsError())
118 return status; 118 return status;
119 closing_count_--; 119 closing_count_--;
120 } 120 }
121 return Status(kOk); 121 return Status(kOk);
122 } 122 }
123 virtual void AddListener(DevToolsEventListener* listener) OVERRIDE { 123 virtual void AddListener(DevToolsEventListener* listener) override {
124 listener_ = listener; 124 listener_ = listener;
125 } 125 }
126 126
127 private: 127 private:
128 DevToolsEventListener* listener_; 128 DevToolsEventListener* listener_;
129 int closing_count_; 129 int closing_count_;
130 }; 130 };
131 131
132 } // namespace 132 } // namespace
133 133
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
200 ASSERT_EQ(kOk, manager.GetDialogMessage(&message).code()); 200 ASSERT_EQ(kOk, manager.GetDialogMessage(&message).code());
201 ASSERT_EQ("hi", message); 201 ASSERT_EQ("hi", message);
202 202
203 ASSERT_EQ( 203 ASSERT_EQ(
204 kOk, 204 kOk,
205 manager.OnEvent(&client, "Page.javascriptDialogClosing", params).code()); 205 manager.OnEvent(&client, "Page.javascriptDialogClosing", params).code());
206 ASSERT_FALSE(manager.IsDialogOpen()); 206 ASSERT_FALSE(manager.IsDialogOpen());
207 ASSERT_EQ(kNoAlertOpen, manager.GetDialogMessage(&message).code()); 207 ASSERT_EQ(kNoAlertOpen, manager.GetDialogMessage(&message).code());
208 ASSERT_EQ(kNoAlertOpen, manager.HandleDialog(false, NULL).code()); 208 ASSERT_EQ(kNoAlertOpen, manager.HandleDialog(false, NULL).code());
209 } 209 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698