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

Side by Side Diff: chrome/browser/speech/extension_api/tts_extension_apitest.cc

Issue 629603002: replace OVERRIDE and FINAL with override and final in chrome/browser/[r-z]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master 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) 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 <vector> 5 #include <vector>
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/memory/weak_ptr.h" 9 #include "base/memory/weak_ptr.h"
10 #include "base/message_loop/message_loop.h" 10 #include "base/message_loop/message_loop.h"
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 private: 164 private:
165 base::WeakPtrFactory<MockTtsPlatformImpl> ptr_factory_; 165 base::WeakPtrFactory<MockTtsPlatformImpl> ptr_factory_;
166 bool should_fake_get_voices_; 166 bool should_fake_get_voices_;
167 }; 167 };
168 168
169 class FakeNetworkOnlineStateForTest : public net::NetworkChangeNotifier { 169 class FakeNetworkOnlineStateForTest : public net::NetworkChangeNotifier {
170 public: 170 public:
171 explicit FakeNetworkOnlineStateForTest(bool online) : online_(online) {} 171 explicit FakeNetworkOnlineStateForTest(bool online) : online_(online) {}
172 virtual ~FakeNetworkOnlineStateForTest() {} 172 virtual ~FakeNetworkOnlineStateForTest() {}
173 173
174 virtual ConnectionType GetCurrentConnectionType() const OVERRIDE { 174 virtual ConnectionType GetCurrentConnectionType() const override {
175 return online_ ? 175 return online_ ?
176 net::NetworkChangeNotifier::CONNECTION_ETHERNET : 176 net::NetworkChangeNotifier::CONNECTION_ETHERNET :
177 net::NetworkChangeNotifier::CONNECTION_NONE; 177 net::NetworkChangeNotifier::CONNECTION_NONE;
178 } 178 }
179 179
180 private: 180 private:
181 bool online_; 181 bool online_;
182 DISALLOW_COPY_AND_ASSIGN(FakeNetworkOnlineStateForTest); 182 DISALLOW_COPY_AND_ASSIGN(FakeNetworkOnlineStateForTest);
183 }; 183 };
184 184
(...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after
439 // Test should fail when offline. 439 // Test should fail when offline.
440 ASSERT_FALSE(RunExtensionTest("tts_engine/network_speech_engine")); 440 ASSERT_FALSE(RunExtensionTest("tts_engine/network_speech_engine"));
441 } 441 }
442 442
443 // http://crbug.com/122474 443 // http://crbug.com/122474
444 IN_PROC_BROWSER_TEST_F(TtsApiTest, EngineApi) { 444 IN_PROC_BROWSER_TEST_F(TtsApiTest, EngineApi) {
445 ASSERT_TRUE(RunExtensionTest("tts_engine/engine_api")) << message_; 445 ASSERT_TRUE(RunExtensionTest("tts_engine/engine_api")) << message_;
446 } 446 }
447 447
448 } // namespace extensions 448 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/speech/extension_api/tts_extension_api.cc ('k') | chrome/browser/speech/tts_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698