Fix "unreachable code" warnings (MSVC warning 4702) in base/.

This also does a little bit of code formatting in the hopes of shorter, more readable code.

BUG=346399
TEST=none
R=thakis@chromium.org

Review URL: https://codereview.chromium.org/202993003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@258398 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 2 insertions, 9 deletions

diff --git a/base/test/expectations/expectation.cc b/base/test/expectations/expectation.cc
index 0674cf5..86ce655 100644
--- a/base/test/expectations/expectation.cc
+++ b/base/test/expectations/expectation.cc
@@ -146,8 +146,6 @@ Configuration GetCurrentConfiguration() {
 #else
   return CONFIGURATION_DEBUG;
 #endif
-  NOTREACHED();
-  return CONFIGURATION_UNSPECIFIED;
 }
 
 Expectation::Expectation()
diff --git a/base/win/event_trace_consumer_unittest.cc b/base/win/event_trace_consumer_unittest.cc
index ac14260..9066a7c 100644
--- a/base/win/event_trace_consumer_unittest.cc
+++ b/base/win/event_trace_consumer_unittest.cc
@@ -155,7 +155,6 @@ class EtwTraceConsumerRealtimeTest: public EtwTraceConsumerBaseTest {
     if (consumer_thread_.Get() == NULL)
       return HRESULT_FROM_WIN32(::GetLastError());
 
-    HRESULT hr = S_OK;
     HANDLE events[] = { consumer_ready_, consumer_thread_ };
     DWORD result = ::WaitForMultipleObjects(arraysize(events), events,
                                             FALSE, INFINITE);
@@ -172,14 +171,10 @@ class EtwTraceConsumerRealtimeTest: public EtwTraceConsumerBaseTest {
           if (::GetExitCodeThread(consumer_thread_, &exit_code))
             return exit_code;
           return HRESULT_FROM_WIN32(::GetLastError());
-          break;
         }
       default:
         return E_UNEXPECTED;
-        break;
     }
-
-    return hr;
   }
 
   // Waits for consumer_ thread to exit, and returns its exit code.
@@ -237,8 +232,8 @@ TEST_F(EtwTraceConsumerRealtimeTest, ConsumeEvent) {
     return;
   }
 
-  ASSERT_HRESULT_SUCCEEDED(controller.EnableProvider(test_provider_,
-      TRACE_LEVEL_VERBOSE, 0xFFFFFFFF));
+  ASSERT_HRESULT_SUCCEEDED(controller.EnableProvider(
+      test_provider_, TRACE_LEVEL_VERBOSE, 0xFFFFFFFF));
 
   EtwTraceProvider provider(test_provider_);
   ASSERT_EQ(ERROR_SUCCESS, provider.Register());