Fix more cases of unreachable code on Windows, mostly added recently.

BUG=346399 TEST=none Review URL: https://codereview.chromium.org/296053005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@272069 0039d316-1c4b-4281-b951-d872f2087c98
dednal · May 22, 2014 · 887dc5d · 887dc5d
1 parent 7f17c7f
commit 887dc5d
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 17 deletions.
diff --git a/ash/display/mouse_cursor_event_filter.cc b/ash/display/mouse_cursor_event_filter.cc
@@ -469,15 +469,12 @@ void MouseCursorEventFilter::GetSrcAndDstRootWindows(aura::Window** src_root,
 bool MouseCursorEventFilter::WarpMouseCursorIfNecessaryForTest(
     aura::Window* target_root,
     const gfx::Point& point_in_screen) {
-  if (enable_mouse_warp_in_native_coords) {
-    gfx::Point native = point_in_screen;
-    wm::ConvertPointFromScreen(target_root, &native);
-    target_root->GetHost()->ConvertPointToNativeScreen(&native);
-    return WarpMouseCursorInNativeCoords(native, point_in_screen);
-  } else {
+  if (!enable_mouse_warp_in_native_coords)
     return WarpMouseCursorInScreenCoords(target_root, point_in_screen);
-  }
-  return true;
+  gfx::Point native = point_in_screen;
+  wm::ConvertPointFromScreen(target_root, &native);
+  target_root->GetHost()->ConvertPointToNativeScreen(&native);
+  return WarpMouseCursorInNativeCoords(native, point_in_screen);
 }
 
 }  // namespace ash
diff --git a/chrome/browser/extensions/extension_apitest.cc b/chrome/browser/extensions/extension_apitest.cc
@@ -281,8 +281,9 @@ bool ExtensionApiTest::RunExtensionSubtest(const std::string& extension_name,
 #if defined(OS_WIN) && !defined(NDEBUG)
   LOG(WARNING) << "Workaround for 177163, prematurely returning";
   return true;
-#endif
+#else
   return RunExtensionTestImpl(extension_name, page_url, NULL, flags);
+#endif
 }
 
 

diff --git a/chrome/test/gpu/gpu_feature_browsertest.cc b/chrome/test/gpu/gpu_feature_browsertest.cc
@@ -213,10 +213,10 @@ IN_PROC_BROWSER_TEST_F(GpuFeatureTest, WebGLAllowed) {
       gpu::GPU_FEATURE_TYPE_WEBGL));
 
   // The below times out: http://crbug.com/166060
-  return;
-
+#if 0
   const base::FilePath url(FILE_PATH_LITERAL("feature_webgl.html"));
   RunEventTest(url, kWebGLCreationEvent, true);
+#endif
 }
 
 IN_PROC_BROWSER_TEST_F(GpuFeatureTest, WebGLBlocked) {

diff --git a/components/search_provider_logos/logo_tracker_unittest.cc b/components/search_provider_logos/logo_tracker_unittest.cc
@@ -224,8 +224,8 @@ class MockLogoCache : public LogoCache {
   }
 
   virtual scoped_ptr<EncodedLogo> GetCachedLogo() OVERRIDE {
-    return make_scoped_ptr(logo_ ? new EncodedLogo(*logo_) : NULL);
     OnGetCachedLogo();
+    return make_scoped_ptr(logo_ ? new EncodedLogo(*logo_) : NULL);
   }
 
  private:

diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -2371,8 +2371,6 @@ scoped_ptr<ResizeLock> RenderWidgetHostViewAura::CreateResizeLock(
       desired_size,
       defer_compositor_lock,
       base::TimeDelta::FromMilliseconds(kResizeLockTimeoutMs)));
-  ResizeLock* lock = NULL;
-  return scoped_ptr<ResizeLock>(lock);
 }
 
 DelegatedFrameHost* RenderWidgetHostViewAura::GetDelegatedFrameHost() const {

diff --git a/content/renderer/p2p/ipc_network_manager.cc b/content/renderer/p2p/ipc_network_manager.cc
@@ -30,7 +30,6 @@ talk_base::AdapterType ConvertConnectionTypeToAdapterType(
     default:
         return talk_base::ADAPTER_TYPE_UNKNOWN;
   }
-  return talk_base::ADAPTER_TYPE_UNKNOWN;
 }
 
 }  // namespace

diff --git a/pdf/pdfium/pdfium_engine.cc b/pdf/pdfium/pdfium_engine.cc
@@ -275,8 +275,6 @@ void OOM_Handler(_OOM_INFO*) {
   // the buffer is then used, it provides a handy mapping of memory starting at
   // address 0 for an attacker to utilize.
   abort();
-  // Paranoia, just in case.
-  *(volatile char*)0 = '\0';
 }
 
 OOM_INFO g_oom_info = {