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

Side by Side Diff: content/test/content_test_suite.cc

Issue 1091093006: Update {virtual,override} to follow C++11 style in content. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Back out some webrtc files. Created 5 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 (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 "content/test/content_test_suite.h" 5 #include "content/test/content_test_suite.h"
6 6
7 #if defined(OS_ANDROID) 7 #if defined(OS_ANDROID)
8 #include <android/native_window.h> 8 #include <android/native_window.h>
9 #include <android/native_window_jni.h> 9 #include <android/native_window_jni.h>
10 #include <map> 10 #include <map>
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 #endif 45 #endif
46 46
47 namespace content { 47 namespace content {
48 namespace { 48 namespace {
49 49
50 class TestInitializationListener : public testing::EmptyTestEventListener { 50 class TestInitializationListener : public testing::EmptyTestEventListener {
51 public: 51 public:
52 TestInitializationListener() : test_content_client_initializer_(NULL) { 52 TestInitializationListener() : test_content_client_initializer_(NULL) {
53 } 53 }
54 54
55 virtual void OnTestStart(const testing::TestInfo& test_info) override { 55 void OnTestStart(const testing::TestInfo& test_info) override {
56 test_content_client_initializer_ = 56 test_content_client_initializer_ =
57 new content::TestContentClientInitializer(); 57 new content::TestContentClientInitializer();
58 } 58 }
59 59
60 virtual void OnTestEnd(const testing::TestInfo& test_info) override { 60 void OnTestEnd(const testing::TestInfo& test_info) override {
61 delete test_content_client_initializer_; 61 delete test_content_client_initializer_;
62 } 62 }
63 63
64 private: 64 private:
65 content::TestContentClientInitializer* test_content_client_initializer_; 65 content::TestContentClientInitializer* test_content_client_initializer_;
66 66
67 DISALLOW_COPY_AND_ASSIGN(TestInitializationListener); 67 DISALLOW_COPY_AND_ASSIGN(TestInitializationListener);
68 }; 68 };
69 69
70 #if defined(OS_ANDROID) 70 #if defined(OS_ANDROID)
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 #endif 133 #endif
134 testing::TestEventListeners& listeners = 134 testing::TestEventListeners& listeners =
135 testing::UnitTest::GetInstance()->listeners(); 135 testing::UnitTest::GetInstance()->listeners();
136 listeners.Append(new TestInitializationListener); 136 listeners.Append(new TestInitializationListener);
137 #if defined(OS_ANDROID) 137 #if defined(OS_ANDROID)
138 SurfaceTextureManager::InitInstance(new SurfaceTextureManagerImpl); 138 SurfaceTextureManager::InitInstance(new SurfaceTextureManagerImpl);
139 #endif 139 #endif
140 } 140 }
141 141
142 } // namespace content 142 } // namespace content
OLDNEW
« no previous file with comments | « content/shell/renderer/test_runner/web_frame_test_proxy.h ('k') | content/test/ppapi/ppapi_test.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698