- Change ALLOW_UNUSED to ALLOW_UNUSED_TYPE and ALLOW_UNUSED_LOCAL to match Chromium.

- Windows: d3dcompiler_46.dll changed to d3dcompiler_47.dll due to 8.1 SDK update (issue #1484).
- Windows: Fix `local variable is initialized but not referenced` warning with Release build (issue #1484).

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1962 5089003a-bbd8-11dd-ad1f-f1f9622dbc98

libcef/browser/menu_creator_runner_linux.cc

@@ -6,15 +6,11 @@
 #include "libcef/browser/browser_host_impl.h"
 #include "libcef/browser/window_x11.h"
 
+#include "base/compiler_specific.h"
 #include "base/strings/string_util.h"
 #include "ui/aura/window.h"
 #include "ui/gfx/point.h"
 
-// Used to silence warnings about unused variables.
-#if !defined(UNUSED)
-#define UNUSED(x) ((void)(x))
-#endif
-
 CefMenuCreatorRunnerLinux::CefMenuCreatorRunnerLinux() {
 }
 
@@ -59,7 +55,7 @@ bool CefMenuCreatorRunnerLinux::RunContextMenu(CefMenuCreator* manager) {
                        NULL, gfx::Rect(screen_point, gfx::Size()),
                        views::MENU_ANCHOR_TOPRIGHT,
                        ui::MENU_SOURCE_NONE);
-  UNUSED(result);
+  ALLOW_UNUSED_LOCAL(result);
 
   return true;
 }

libcef/browser/render_widget_host_view_osr_mac.mm

@@ -10,12 +10,9 @@
 #include "libcef/browser/browser_host_impl.h"
 #include "libcef/browser/text_input_client_osr_mac.h"
 
+#include "base/compiler_specific.h"
 #include "ui/events/latency_info.h"
 
-#if !defined(UNUSED)
-#define UNUSED(x)	((void)(x))	/* to avoid warnings */
-#endif
-
 namespace {
 
 CefTextInputClientOSRMac* GetInputClientFromContext(
@@ -310,7 +307,7 @@ void CefRenderWidgetHostViewOSR::PlatformDestroyCompositorWidget() {
 
   // Compositor is owned by and will be freed by BrowserCompositorMac.
   ui::Compositor* compositor = compositor_.release();
-  UNUSED(compositor);
+  ALLOW_UNUSED_LOCAL(compositor);
 
   [window_ close];
   window_ = nil;