Enable chrome://device-emulator in non-official NDEBUG builds.

chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc

Index: chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
index ac57a4128795a205acd80b7335dd6d5b6fdb348c..7825cc61c788d97e79541ee44bb186e89099cb9c 100644
--- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
+++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
@@ -135,6 +135,7 @@
 #include "chrome/browser/ui/webui/chromeos/choose_mobile_network_ui.h"
 #include "chrome/browser/ui/webui/chromeos/cryptohome_ui.h"
 #include "chrome/browser/ui/webui/chromeos/drive_internals_ui.h"
+#include "chrome/browser/ui/webui/chromeos/emulator/device_emulator_ui.h"
 #include "chrome/browser/ui/webui/chromeos/first_run/first_run_ui.h"
 #include "chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.h"
 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
@@ -151,10 +152,6 @@
 #include "components/proximity_auth/webui/url_constants.h"
 #endif
 
-#if defined(OS_CHROMEOS) && !defined(NDEBUG)
-#include "chrome/browser/ui/webui/chromeos/emulator/device_emulator_ui.h"
-#endif
-
 #if !defined(OS_CHROMEOS)
 #include "chrome/browser/ui/webui/app_launcher_page_ui.h"
 #endif
@@ -517,12 +514,10 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
     return &NewWebUI<chromeos::SlowTraceController>;
   if (url.host() == chrome::kChromeUIVoiceSearchHost)
     return &NewWebUI<VoiceSearchUI>;
-#if !defined(NDEBUG)
   if (!base::SysInfo::IsRunningOnChromeOS()) {
     if (url.host() == chrome::kChromeUIDeviceEmulatorHost)
       return &NewWebUI<DeviceEmulatorUI>;

[michaelpg, 2016/10/22 23:28:29]

IIUC, removing the !NDEBUG preprocessor checks will make this code compile on
Official builds, but the DeviceEmulatorUI and MessageHandler themselves are
still not compiled on official builds. How could this link?

[stevenjb, 2016/10/24 17:18:55]

+1, I think this code and the include need to be wrapped in
defined(OFFICIAL_BUILD).

[scheib, 2016/11/03 23:58:59]

Done.

   }
-#endif  // !defined(NDEBUG)
 #endif  // defined(OS_CHROMEOS)
 #if defined(OS_ANDROID)
   if (url.host() == chrome::kChromeUIOfflineInternalsHost)