Fix some warnings on gcc 4.7 on Linux.

chrome/browser/devtools/devtools_adb_bridge_browsertest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/devtools/android_device.h"
 #include "chrome/browser/devtools/devtools_adb_bridge.h"
 #include "chrome/browser/devtools/devtools_target_impl.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "content/public/test/test_utils.h"
@@ skipping 93 matching lines @@
   MockDeviceImpl(const std::string& serial, int index,
                  bool connected, const char* device_model)
       : AndroidDevice(serial, connected),
         device_model_(device_model)
   {}
 
   virtual void RunCommand(const std::string& command,
                             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,
                          this, callback, 0, response));
   }
 
   void RunCommandCallback(const CommandCallback& callback, int result,
                           const std::string& response) {
     callback.Run(result, response);
   }
 
   virtual void OpenSocket(const std::string& name,
                           const SocketCallback& callback) OVERRIDE {
     NOTREACHED();
   }
 
   virtual void HttpQuery(const std::string& la_name,
                      const std::string& request,
                      const CommandCallback& callback) OVERRIDE {
     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,
               base::Bind(&MockDeviceImpl::RunCommandCallback,
                          this, callback, 0, response));
   }
 
   virtual void HttpUpgrade(const std::string& la_name,
                        const std::string& request,
                        const SocketCallback& callback) {
@@ skipping 112 matching lines @@
   adb_bridge->set_device_providers(providers);
 
   if (!adb_bridge) {
     FAIL() << "Failed to get DevToolsAdbBridge.";
   }
 
   adb_bridge->AddListener(this);
 
   runner_->Run();
 }