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

Unified Diff: chrome/browser/devtools/devtools_adb_bridge_browsertest.cc

Issue 51453003: Fix some warnings on gcc 4.7 on Linux. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | google_apis/gcm/engine/connection_handler_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/devtools/devtools_adb_bridge_browsertest.cc
diff --git a/chrome/browser/devtools/devtools_adb_bridge_browsertest.cc b/chrome/browser/devtools/devtools_adb_bridge_browsertest.cc
index d41ba56c107c9424d3b93984b6565daa83887523..e12ef507e516200aa2db4508fdddb74d35a45e50 100644
--- a/chrome/browser/devtools/devtools_adb_bridge_browsertest.cc
+++ b/chrome/browser/devtools/devtools_adb_bridge_browsertest.cc
@@ -111,16 +111,18 @@ class MockDeviceImpl : public AndroidDevice {
const CommandCallback& callback) OVERRIDE {
const char* response;
- if (command == kDeviceModelCommand)
+ if (command == kDeviceModelCommand) {
response = device_model_;
- else if (command == kOpenedUnixSocketsCommand)
+ } else if (command == kOpenedUnixSocketsCommand) {
response = kSampleOpenedUnixSockets;
- else if (command == kListProcessesCommand)
+ } else if (command == kListProcessesCommand) {
response = kSampleListProcesses;
- else if (command == kDumpsysCommand)
+ } else if (command == kDumpsysCommand) {
response = kSampleDumpsysCommand;
- else
+ } else {
NOTREACHED();
+ return;
+ }
base::MessageLoop::current()->PostTask( FROM_HERE,
base::Bind(&MockDeviceImpl::RunCommandCallback,
@@ -143,21 +145,26 @@ class MockDeviceImpl : public AndroidDevice {
const char* response;
if (la_name == "chrome_devtools_remote") {
- if (request == kVersionRequest)
+ if (request == kVersionRequest) {
response = kSampleChromeVersion;
- else if (request == kPageListRequest)
+ } else if (request == kPageListRequest) {
response = kSampleChromePages;
- else
+ } else {
NOTREACHED();
+ return;
+ }
} else if (la_name == "webview_devtools_remote_2425") {
- if (request == kVersionRequest)
+ if (request == kVersionRequest) {
response = kSampleWebViewVersion;
- else if (request == kPageListRequest)
+ } else if (request == kPageListRequest) {
response = kSampleWebViewPages;
- else
+ } else {
NOTREACHED();
+ return;
+ }
} else {
NOTREACHED();
+ return;
}
base::MessageLoop::current()->PostTask( FROM_HERE,
« no previous file with comments | « no previous file | google_apis/gcm/engine/connection_handler_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698