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

Side by Side Diff: content/renderer/pepper/pepper_file_chooser_host_unittest.cc

Issue 686523002: Standardize usage of virtual/override/final specifiers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase 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 "base/files/file_path.h" 5 #include "base/files/file_path.h"
6 #include "base/strings/utf_string_conversions.h" 6 #include "base/strings/utf_string_conversions.h"
7 #include "content/common/view_messages.h" 7 #include "content/common/view_messages.h"
8 #include "content/public/common/file_chooser_file_info.h" 8 #include "content/public/common/file_chooser_file_info.h"
9 #include "content/public/common/file_chooser_params.h" 9 #include "content/public/common/file_chooser_params.h"
10 #include "content/public/test/render_view_test.h" 10 #include "content/public/test/render_view_test.h"
(...skipping 15 matching lines...) Expand all
26 #include "testing/gtest/include/gtest/gtest.h" 26 #include "testing/gtest/include/gtest/gtest.h"
27 27
28 namespace content { 28 namespace content {
29 29
30 namespace { 30 namespace {
31 31
32 class PepperFileChooserHostTest : public RenderViewTest { 32 class PepperFileChooserHostTest : public RenderViewTest {
33 public: 33 public:
34 PepperFileChooserHostTest() : pp_instance_(123456) {} 34 PepperFileChooserHostTest() : pp_instance_(123456) {}
35 35
36 virtual void SetUp() { 36 void SetUp() override {
37 SetContentClient(&client_); 37 SetContentClient(&client_);
38 RenderViewTest::SetUp(); 38 RenderViewTest::SetUp();
39 ppapi::ProxyLock::DisableLockingOnThreadForTest(); 39 ppapi::ProxyLock::DisableLockingOnThreadForTest();
40 40
41 globals_.GetResourceTracker()->DidCreateInstance(pp_instance_); 41 globals_.GetResourceTracker()->DidCreateInstance(pp_instance_);
42 } 42 }
43 virtual void TearDown() { 43 void TearDown() override {
44 globals_.GetResourceTracker()->DidDeleteInstance(pp_instance_); 44 globals_.GetResourceTracker()->DidDeleteInstance(pp_instance_);
45 45
46 RenderViewTest::TearDown(); 46 RenderViewTest::TearDown();
47 } 47 }
48 48
49 PP_Instance pp_instance() const { return pp_instance_; } 49 PP_Instance pp_instance() const { return pp_instance_; }
50 50
51 private: 51 private:
52 PP_Instance pp_instance_; 52 PP_Instance pp_instance_;
53 53
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 accept.push_back("text/plain"); 142 accept.push_back("text/plain");
143 PpapiHostMsg_FileChooser_Show show_msg(false, false, std::string(), accept); 143 PpapiHostMsg_FileChooser_Show show_msg(false, false, std::string(), accept);
144 144
145 ppapi::proxy::ResourceMessageCallParams call_params(pp_resource, 0); 145 ppapi::proxy::ResourceMessageCallParams call_params(pp_resource, 0);
146 ppapi::host::HostMessageContext context(call_params); 146 ppapi::host::HostMessageContext context(call_params);
147 int32 result = chooser.OnResourceMessageReceived(show_msg, &context); 147 int32 result = chooser.OnResourceMessageReceived(show_msg, &context);
148 EXPECT_EQ(PP_ERROR_NO_USER_GESTURE, result); 148 EXPECT_EQ(PP_ERROR_NO_USER_GESTURE, result);
149 } 149 }
150 150
151 } // namespace content 151 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698