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

Side by Side Diff: chrome/browser/devtools/device/adb/adb_client_socket_browsertest.cc

Issue 625113002: replace OVERRIDE and FINAL with override and final in chrome/browser/[a-i]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix newly added OVERRIDEs 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 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 #include "chrome/browser/devtools/device/adb/adb_device_provider.h" 5 #include "chrome/browser/devtools/device/adb/adb_device_provider.h"
6 #include "chrome/browser/devtools/device/adb/mock_adb_server.h" 6 #include "chrome/browser/devtools/device/adb/mock_adb_server.h"
7 #include "chrome/browser/devtools/device/devtools_android_bridge.h" 7 #include "chrome/browser/devtools/device/devtools_android_bridge.h"
8 #include "chrome/browser/devtools/devtools_target_impl.h" 8 #include "chrome/browser/devtools/devtools_target_impl.h"
9 #include "chrome/browser/ui/browser.h" 9 #include "chrome/browser/ui/browser.h"
10 #include "chrome/test/base/in_process_browser_test.h" 10 #include "chrome/test/base/in_process_browser_test.h"
(...skipping 20 matching lines...) Expand all
31 Profile* profile = browser()->profile(); 31 Profile* profile = browser()->profile();
32 android_bridge_ = DevToolsAndroidBridge::Factory::GetForProfile(profile); 32 android_bridge_ = DevToolsAndroidBridge::Factory::GetForProfile(profile);
33 AndroidDeviceManager::DeviceProviders device_providers; 33 AndroidDeviceManager::DeviceProviders device_providers;
34 device_providers.push_back(new AdbDeviceProvider()); 34 device_providers.push_back(new AdbDeviceProvider());
35 android_bridge_->set_device_providers_for_test(device_providers); 35 android_bridge_->set_device_providers_for_test(device_providers);
36 android_bridge_->AddDeviceListListener(this); 36 android_bridge_->AddDeviceListListener(this);
37 content::RunMessageLoop(); 37 content::RunMessageLoop();
38 } 38 }
39 39
40 virtual void DeviceListChanged( 40 virtual void DeviceListChanged(
41 const DevToolsAndroidBridge::RemoteDevices& devices) OVERRIDE { 41 const DevToolsAndroidBridge::RemoteDevices& devices) override {
42 devices_ = devices; 42 devices_ = devices;
43 android_bridge_->RemoveDeviceListListener(this); 43 android_bridge_->RemoveDeviceListListener(this);
44 base::MessageLoop::current()->Quit(); 44 base::MessageLoop::current()->Quit();
45 } 45 }
46 46
47 void CheckDevices() { 47 void CheckDevices() {
48 ASSERT_EQ(2U, devices_.size()); 48 ASSERT_EQ(2U, devices_.size());
49 49
50 scoped_refptr<DevToolsAndroidBridge::RemoteDevice> connected = 50 scoped_refptr<DevToolsAndroidBridge::RemoteDevice> connected =
51 devices_[0]->is_connected() ? devices_[0] : devices_[1]; 51 devices_[0]->is_connected() ? devices_[0] : devices_[1];
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 scoped_refptr<DevToolsAndroidBridge> android_bridge_; 124 scoped_refptr<DevToolsAndroidBridge> android_bridge_;
125 DevToolsAndroidBridge::RemoteDevices devices_; 125 DevToolsAndroidBridge::RemoteDevices devices_;
126 }; 126 };
127 127
128 IN_PROC_BROWSER_TEST_F(AdbClientSocketTest, TestAdbClientSocket) { 128 IN_PROC_BROWSER_TEST_F(AdbClientSocketTest, TestAdbClientSocket) {
129 StartMockAdbServer(); 129 StartMockAdbServer();
130 StartTest(); 130 StartTest();
131 CheckDevices(); 131 CheckDevices();
132 StopMockAdbServer(); 132 StopMockAdbServer();
133 } 133 }
OLDNEW
« no previous file with comments | « chrome/browser/devtools/chrome_devtools_manager_delegate.h ('k') | chrome/browser/devtools/device/adb/adb_device_provider.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698