Move ChromeOS-only WebUI into c/b/ui/webui/chromeos.

Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
Change-Id: I2f8eedac96fae027fd4621b5b8b2e357971b618f
Reviewed-on: https://chromium-review.googlesource.com/689854
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: calamity <calamity@chromium.org>
Reviewed-by: Steven Bennetts <stevenjb@chromium.org>
Reviewed-by: Naoki Fukino <fukino@chromium.org>
Cr-Commit-Position: refs/heads/master@{#505899}

chrome/browser/browser_resources.grd

@@ -683,17 +683,17 @@
       <include name="IDR_MEDIA_ENGAGEMENT_JS" file="resources\media\media_engagement.js" flattenhtml="true" type="BINDATA" compress="gzip" />
       <include name="IDR_MEDIA_ENGAGEMENT_MOJO_JS" file="${root_gen_dir}\chrome\browser\media\media_engagement_score_details.mojom.js" use_base_dir="false" type="BINDATA" compress="gzip" />
       <if expr="chromeos">
-        <include name="IDR_SYS_INTERNALS_HTML" file="resources\sys_internals\index.html" type="BINDATA" />
-        <include name="IDR_SYS_INTERNALS_CSS" file="resources\sys_internals\index.css" type="BINDATA" />
-        <include name="IDR_SYS_INTERNALS_JS" file="resources\sys_internals\index.js" type="BINDATA" />
-        <include name="IDR_SYS_INTERNALS_CONSTANT_JS" file="resources\sys_internals\constants.js" type="BINDATA" />
-        <include name="IDR_SYS_INTERNALS_LINE_CHART_CSS" file="resources\sys_internals\line_chart\line_chart.css" type="BINDATA" />
-        <include name="IDR_SYS_INTERNALS_LINE_CHART_JS" file="resources\sys_internals\line_chart\index.js" flattenhtml="true" type="BINDATA" />
-        <include name="IDR_SYS_INTERNALS_IMAGE_MENU_SVG" file="resources\sys_internals\img\menu.svg" type="BINDATA" />
-        <include name="IDR_SYS_INTERNALS_IMAGE_INFO_SVG" file="resources\sys_internals\img\info.svg" type="BINDATA" />
-        <include name="IDR_SYS_INTERNALS_IMAGE_CPU_SVG" file="resources\sys_internals\img\cpu.svg" type="BINDATA" />
-        <include name="IDR_SYS_INTERNALS_IMAGE_MEMORY_SVG" file="resources\sys_internals\img\memory.svg" type="BINDATA" />
-        <include name="IDR_SYS_INTERNALS_IMAGE_ZRAM_SVG" file="resources\sys_internals\img\zram.svg" type="BINDATA" />
+        <include name="IDR_SYS_INTERNALS_HTML" file="resources\chromeos\sys_internals\index.html" type="BINDATA" />
+        <include name="IDR_SYS_INTERNALS_CSS" file="resources\chromeos\sys_internals\index.css" type="BINDATA" />
+        <include name="IDR_SYS_INTERNALS_JS" file="resources\chromeos\sys_internals\index.js" type="BINDATA" />
+        <include name="IDR_SYS_INTERNALS_CONSTANT_JS" file="resources\chromeos\sys_internals\constants.js" type="BINDATA" />
+        <include name="IDR_SYS_INTERNALS_LINE_CHART_CSS" file="resources\chromeos\sys_internals\line_chart\line_chart.css" type="BINDATA" />
+        <include name="IDR_SYS_INTERNALS_LINE_CHART_JS" file="resources\chromeos\sys_internals\line_chart\index.js" flattenhtml="true" type="BINDATA" />
+        <include name="IDR_SYS_INTERNALS_IMAGE_MENU_SVG" file="resources\chromeos\sys_internals\img\menu.svg" type="BINDATA" />
+        <include name="IDR_SYS_INTERNALS_IMAGE_INFO_SVG" file="resources\chromeos\sys_internals\img\info.svg" type="BINDATA" />
+        <include name="IDR_SYS_INTERNALS_IMAGE_CPU_SVG" file="resources\chromeos\sys_internals\img\cpu.svg" type="BINDATA" />
+        <include name="IDR_SYS_INTERNALS_IMAGE_MEMORY_SVG" file="resources\chromeos\sys_internals\img\memory.svg" type="BINDATA" />
+        <include name="IDR_SYS_INTERNALS_IMAGE_ZRAM_SVG" file="resources\chromeos\sys_internals\img\zram.svg" type="BINDATA" />
       </if>
     </includes>
   </release>

chrome/browser/chromeos/BUILD.gn

@@ -1512,8 +1512,6 @@ source_set("chromeos") {
     "upgrade_detector_chromeos.h",
 
     # Extension API implementations.
-    "../ui/webui/voice_search_ui.cc",
-    "../ui/webui/voice_search_ui.h",
     "extensions/echo_private_api.cc",
     "extensions/echo_private_api.h",
     "extensions/file_manager/device_event_router.cc",

chrome/browser/resources/sys_internals/compiled_resources2.gyp → chrome/browser/resources/chromeos/sys_internals/compiled_resources2.gyp

@@ -12,25 +12,25 @@
         'line_chart/compiled_resources2.gyp:*',
         '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:cr',
       ],
-      'includes': ['../../../../third_party/closure_compiler/compile_js2.gypi'],
+      'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi'],
     },
     {
       'target_name': 'constants',
       'dependencies': [
         '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:cr',
       ],
-      'includes': ['../../../../third_party/closure_compiler/compile_js2.gypi'],
+      'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi'],
     },
     {
       'target_name': 'externs',
-      'includes': ['../../../../third_party/closure_compiler/compile_js2.gypi'],
+      'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi'],
     },
     {
       'target_name': 'types',
       'dependencies': [
         'line_chart/compiled_resources2.gyp:data_series',
       ],
-      'includes': ['../../../../third_party/closure_compiler/compile_js2.gypi'],
+      'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi'],
     },
   ],
 }

chrome/browser/resources/sys_internals/line_chart/compiled_resources2.gyp → chrome/browser/resources/chromeos/sys_internals/line_chart/compiled_resources2.gyp

@@ -13,7 +13,7 @@
         'constants',
         '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:util',
       ],
-      'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi'],
+      'includes': ['../../../../../../third_party/closure_compiler/compile_js2.gypi'],
     },
     {
       'target_name': 'sub_chart',
@@ -22,7 +22,7 @@
         'data_series',
         'constants',
       ],
-      'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi'],
+      'includes': ['../../../../../../third_party/closure_compiler/compile_js2.gypi'],
     },
     {
       'target_name': 'scrollbar',
@@ -30,14 +30,14 @@
         'constants',
         '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:util',
       ],
-      'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi'],
+      'includes': ['../../../../../../third_party/closure_compiler/compile_js2.gypi'],
     },
     {
       'target_name': 'unit_label',
       'dependencies': [
         'constants',
       ],
-      'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi'],
+      'includes': ['../../../../../../third_party/closure_compiler/compile_js2.gypi'],
     },
     {
       'target_name': 'menu',
@@ -46,18 +46,18 @@
         'data_series',
         '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:util',
       ],
-      'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi'],
+      'includes': ['../../../../../../third_party/closure_compiler/compile_js2.gypi'],
     },
     {
       'target_name': 'data_series',
       'dependencies': [
         'constants',
       ],
-      'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi'],
+      'includes': ['../../../../../../third_party/closure_compiler/compile_js2.gypi'],
     },
     {
       'target_name': 'constants',
-      'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi'],
+      'includes': ['../../../../../../third_party/closure_compiler/compile_js2.gypi'],
     },
   ],
 }

chrome/browser/ui/BUILD.gn

@@ -1306,8 +1306,14 @@ split_static_library("ui") {
       "webui/chromeos/slow_trace_ui.h",
       "webui/chromeos/slow_ui.cc",
       "webui/chromeos/slow_ui.h",
+      "webui/chromeos/sys_internals/sys_internals_message_handler.cc",
+      "webui/chromeos/sys_internals/sys_internals_message_handler.h",
+      "webui/chromeos/sys_internals/sys_internals_ui.cc",
+      "webui/chromeos/sys_internals/sys_internals_ui.h",
       "webui/chromeos/user_image_source.cc",
       "webui/chromeos/user_image_source.h",
+      "webui/chromeos/voice_search_ui.cc",
+      "webui/chromeos/voice_search_ui.h",
       "webui/extensions/chromeos/kiosk_apps_handler.cc",
       "webui/extensions/chromeos/kiosk_apps_handler.h",
       "webui/help/help_utils_chromeos.cc",
@@ -1342,10 +1348,6 @@ split_static_library("ui") {
       "webui/settings/chromeos/google_assistant_handler.h",
       "webui/settings/chromeos/internet_handler.cc",
       "webui/settings/chromeos/internet_handler.h",
-      "webui/sys_internals/sys_internals_message_handler.cc",
-      "webui/sys_internals/sys_internals_message_handler.h",
-      "webui/sys_internals/sys_internals_ui.cc",
-      "webui/sys_internals/sys_internals_ui.h",
       "webui/version_handler_chromeos.cc",
       "webui/version_handler_chromeos.h",
     ]

chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc

@@ -150,8 +150,8 @@
 #include "chrome/browser/ui/webui/chromeos/sim_unlock_ui.h"
 #include "chrome/browser/ui/webui/chromeos/slow_trace_ui.h"
 #include "chrome/browser/ui/webui/chromeos/slow_ui.h"
-#include "chrome/browser/ui/webui/sys_internals/sys_internals_ui.h"
-#include "chrome/browser/ui/webui/voice_search_ui.h"
+#include "chrome/browser/ui/webui/chromeos/sys_internals/sys_internals_ui.h"
+#include "chrome/browser/ui/webui/chromeos/voice_search_ui.h"
 #include "components/proximity_auth/webui/proximity_auth_ui.h"
 #include "components/proximity_auth/webui/url_constants.h"
 #endif

chrome/browser/ui/webui/sys_internals/sys_internals_message_handler.cc → chrome/browser/ui/webui/chromeos/sys_internals/sys_internals_message_handler.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/ui/webui/sys_internals/sys_internals_message_handler.h"
+#include "chrome/browser/ui/webui/chromeos/sys_internals/sys_internals_message_handler.h"
 
 #include <inttypes.h>
 #include <cstdio>

chrome/browser/ui/webui/sys_internals/sys_internals_message_handler.h → chrome/browser/ui/webui/chromeos/sys_internals/sys_internals_message_handler.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_UI_WEBUI_SYS_INTERNALS_SYS_INTERNALS_MESSAGE_HANDLER_H_
-#define CHROME_BROWSER_UI_WEBUI_SYS_INTERNALS_SYS_INTERNALS_MESSAGE_HANDLER_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_SYS_INTERNALS_SYS_INTERNALS_MESSAGE_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_CHROMEOS_SYS_INTERNALS_SYS_INTERNALS_MESSAGE_HANDLER_H_
 
 #include <stdint.h>
 #include <memory>
@@ -24,9 +24,9 @@ class SysInternalsMessageHandler : public content::WebUIMessageHandler {
   // content::WebUIMessageHandler methods:
   void RegisterMessages() override;
 
-  // Because the |base::Value| API only supports 32-bit signed integer,
+  // Because the base::Value API only supports 32-bit signed integer,
   // we need to make sure every counter is less than the maximum value.
-  // See |ToCounter()| in |sys_internals_message_handler.cc|.
+  // See ToCounter() in sys_internals_message_handler.cc.
   static const uint32_t COUNTER_MAX = 0x7FFFFFFFu;
 
  private:
@@ -74,4 +74,4 @@ class SysInternalsMessageHandler : public content::WebUIMessageHandler {
   DISALLOW_COPY_AND_ASSIGN(SysInternalsMessageHandler);
 };
 
-#endif  // CHROME_BROWSER_UI_WEBUI_SYS_INTERNALS_SYS_INTERNALS_MESSAGE_HANDLER_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_CHROMEOS_SYS_INTERNALS_SYS_INTERNALS_MESSAGE_HANDLER_H_

chrome/browser/ui/webui/sys_internals/sys_internals_ui.cc → chrome/browser/ui/webui/chromeos/sys_internals/sys_internals_ui.cc

@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/ui/webui/sys_internals/sys_internals_ui.h"
+#include "chrome/browser/ui/webui/chromeos/sys_internals/sys_internals_ui.h"
 
 #include "base/feature_list.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/ui/webui/sys_internals/sys_internals_message_handler.h"
+#include "chrome/browser/ui/webui/chromeos/sys_internals/sys_internals_message_handler.h"
 #include "chrome/common/chrome_features.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/browser_resources.h"

chrome/browser/ui/webui/sys_internals/sys_internals_ui.h → chrome/browser/ui/webui/chromeos/sys_internals/sys_internals_ui.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_UI_WEBUI_SYS_INTERNALS_SYS_INTERNALS_UI_H_
-#define CHROME_BROWSER_UI_WEBUI_SYS_INTERNALS_SYS_INTERNALS_UI_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_SYS_INTERNALS_SYS_INTERNALS_UI_H_
+#define CHROME_BROWSER_UI_WEBUI_CHROMEOS_SYS_INTERNALS_SYS_INTERNALS_UI_H_
 
 #include "base/macros.h"
 #include "content/public/browser/web_ui_controller.h"
@@ -20,4 +20,4 @@ class SysInternalsUI : public content::WebUIController {
   DISALLOW_COPY_AND_ASSIGN(SysInternalsUI);
 };
 
-#endif  // CHROME_BROWSER_UI_WEBUI_SYS_INTERNALS_SYS_INTERNALS_UI_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_CHROMEOS_SYS_INTERNALS_SYS_INTERNALS_UI_H_

chrome/browser/ui/webui/voice_search_ui.cc → chrome/browser/ui/webui/chromeos/voice_search_ui.cc

@@ -2,24 +2,20 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/ui/webui/voice_search_ui.h"
+#include "chrome/browser/ui/webui/chromeos/voice_search_ui.h"
 
+#include <memory>
 #include <string>
 #include <utility>
 
-#include "base/command_line.h"
 #include "base/files/file_enumerator.h"
 #include "base/macros.h"
-#include "base/memory/ptr_util.h"
 #include "base/memory/weak_ptr.h"
-#include "base/metrics/field_trial.h"
 #include "base/path_service.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/task_scheduler/post_task.h"
 #include "base/threading/thread_restrictions.h"
-#include "build/build_config.h"
-#include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/plugins/plugin_prefs.h"
 #include "chrome/browser/profiles/profile.h"
@@ -53,10 +49,6 @@
 #include "extensions/features/features.h"
 #include "ui/base/l10n/l10n_util.h"
 
-#if defined(OS_WIN)
-#include "base/win/windows_version.h"
-#endif
-
 using base::ASCIIToUTF16;
 using content::WebUIMessageHandler;
 
@@ -83,7 +75,7 @@ content::WebUIDataSource* CreateVoiceSearchUiHtmlSource() {
 void AddPair16(base::ListValue* list,
                const base::string16& key,
                const base::string16& value) {
-  std::unique_ptr<base::DictionaryValue> results(new base::DictionaryValue());
+  auto results = std::make_unique<base::DictionaryValue>();
   results->SetString("key", key);
   results->SetString("value", value);
   list->Append(std::move(results));
@@ -106,26 +98,25 @@ void AddLineBreak(base::ListValue* list) {
   AddPair(list, "", "");
 }
 
-void AddSharedModulePlatformsOnFileThread(base::ListValue* list,
+void AddSharedModulePlatformsOnBlockingTaskRunner(base::ListValue* list,
                                                   const base::FilePath& path) {
-  base::ThreadRestrictions::AssertIOAllowed();
+  base::AssertBlockingAllowed();
+
+  if (path.empty())
+    return;
 
-  if (!path.empty()) {
   // Display available platforms for shared module.
   base::FilePath platforms_path = path.AppendASCII("_platform_specific");
-    base::FileEnumerator enumerator(
-        platforms_path, false, base::FileEnumerator::DIRECTORIES);
+  base::FileEnumerator enumerator(platforms_path, false,
+                                  base::FileEnumerator::DIRECTORIES);
   base::string16 files;
-    for (base::FilePath name = enumerator.Next();
-         !name.empty();
+  for (base::FilePath name = enumerator.Next(); !name.empty();
        name = enumerator.Next()) {
     files += name.BaseName().LossyDisplayName() + ASCIIToUTF16(" ");
   }
-    AddPair16(list,
-              ASCIIToUTF16("Shared Module Platforms"),
+  AddPair16(list, ASCIIToUTF16("Shared Module Platforms"),
             files.empty() ? ASCIIToUTF16("undefined") : files);
   AddLineBreak(list);
-  }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -138,8 +129,7 @@ void AddSharedModulePlatformsOnFileThread(base::ListValue* list,
 class VoiceSearchDomHandler : public WebUIMessageHandler {
  public:
   explicit VoiceSearchDomHandler(Profile* profile)
-      : profile_(profile),
-        weak_factory_(this) {}
+      : profile_(profile), weak_factory_(this) {}
 
   ~VoiceSearchDomHandler() override {}
 
@@ -169,7 +159,7 @@ class VoiceSearchDomHandler : public WebUIMessageHandler {
   // Fill in the data to be displayed on the page.
   void PopulatePageInformation() {
     // Store Key-Value pairs of about-information.
-    std::unique_ptr<base::ListValue> list(new base::ListValue());
+    auto list = std::make_unique<base::ListValue>();
 
     // Populate information.
     AddOperatingSystemInfo(list.get());
@@ -178,12 +168,10 @@ class VoiceSearchDomHandler : public WebUIMessageHandler {
     AddHotwordInfo(list.get());
     AddAppListInfo(list.get());
 
-    AddExtensionInfo(extension_misc::kHotwordNewExtensionId,
-                     "Extension",
+    AddExtensionInfo(extension_misc::kHotwordNewExtensionId, "Extension",
                      list.get());
 
-    AddExtensionInfo(extension_misc::kHotwordSharedModuleId,
-                     "Shared Module",
+    AddExtensionInfo(extension_misc::kHotwordSharedModuleId, "Shared Module",
                      list.get());
 
     base::FilePath path;
@@ -201,7 +189,8 @@ class VoiceSearchDomHandler : public WebUIMessageHandler {
     base::ListValue* raw_list = list.get();
     base::PostTaskWithTraitsAndReply(
         FROM_HERE, {base::TaskPriority::USER_VISIBLE, base::MayBlock()},
-        base::BindOnce(&AddSharedModulePlatformsOnFileThread, raw_list, path),
+        base::BindOnce(&AddSharedModulePlatformsOnBlockingTaskRunner, raw_list,
+                       path),
         base::BindOnce(&VoiceSearchDomHandler::ReturnVoiceSearchInfo,
                        weak_factory_.GetWeakPtr(),
                        base::Passed(std::move(list))));
@@ -210,43 +199,12 @@ class VoiceSearchDomHandler : public WebUIMessageHandler {
   // Adds information regarding the system and chrome version info to list.
   void AddOperatingSystemInfo(base::ListValue* list) {
     // Obtain the Chrome version info.
-    AddPair(list,
-            l10n_util::GetStringUTF8(IDS_PRODUCT_NAME),
+    AddPair(list, l10n_util::GetStringUTF8(IDS_PRODUCT_NAME),
             version_info::GetVersionNumber() + " (" +
                 chrome::GetChannelString() + ")");
 
     // OS version information.
     std::string os_label = version_info::GetOSType();
-#if defined(OS_WIN)
-    base::win::OSInfo* os = base::win::OSInfo::GetInstance();
-    switch (os->version()) {
-      case base::win::VERSION_XP:
-        os_label += " XP";
-        break;
-      case base::win::VERSION_SERVER_2003:
-        os_label += " Server 2003 or XP Pro 64 bit";
-        break;
-      case base::win::VERSION_VISTA:
-        os_label += " Vista or Server 2008";
-        break;
-      case base::win::VERSION_WIN7:
-        os_label += " 7 or Server 2008 R2";
-        break;
-      case base::win::VERSION_WIN8:
-        os_label += " 8 or Server 2012";
-        break;
-      default:
-        os_label += " UNKNOWN";
-        break;
-    }
-    os_label += " SP" + base::IntToString(os->service_pack().major);
-
-    if (os->service_pack().minor > 0)
-      os_label += "." + base::IntToString(os->service_pack().minor);
-
-    if (os->architecture() == base::win::OSInfo::X64_ARCHITECTURE)
-      os_label += " 64 bit";
-#endif
     AddPair(list, l10n_util::GetStringUTF8(IDS_VERSION_UI_OS), os_label);
 
     AddLineBreak(list);
@@ -258,7 +216,6 @@ class VoiceSearchDomHandler : public WebUIMessageHandler {
     // platforms. ENABLE_EXTENSIONS covers those platforms and hey would not
     // allow Hotwording anyways since it is an extension.
     std::string nacl_enabled = "not available";
-#if BUILDFLAG(ENABLE_EXTENSIONS)
     nacl_enabled = "No";
     // Determine if NaCl is available.
     base::FilePath path;
@@ -271,7 +228,6 @@ class VoiceSearchDomHandler : public WebUIMessageHandler {
         nacl_enabled = "Yes";
       }
     }
-#endif
 
     AddPair(list, "NaCl Enabled", nacl_enabled);
 
@@ -289,16 +245,9 @@ class VoiceSearchDomHandler : public WebUIMessageHandler {
   // Adds information regarding languages to the list.
   void AddLanguageInfo(base::ListValue* list) {
     std::string locale =
-#if defined(OS_CHROMEOS)
-        // On ChromeOS locale is per-profile.
         profile_->GetPrefs()->GetString(prefs::kApplicationLocale);
-#else
-        g_browser_process->GetApplicationLocale();
-#endif
     AddPair(list, "Current Language", locale);
-
-    AddPair(list,
-            "Hotword Previous Language",
+    AddPair(list, "Hotword Previous Language",
             profile_->GetPrefs()->GetString(prefs::kHotwordPreviousLanguage));
 
     AddLineBreak(list);
@@ -348,10 +297,9 @@ class VoiceSearchDomHandler : public WebUIMessageHandler {
     }
     AddPair(list, name_prefix + " Id", id);
     AddPair(list, name_prefix + " Version", version);
-    AddPair16(list,
-              ASCIIToUTF16(name_prefix + " Path"),
-              path.empty() ?
-              ASCIIToUTF16("undefined") : path.LossyDisplayName());
+    AddPair16(
+        list, ASCIIToUTF16(name_prefix + " Path"),
+        path.empty() ? ASCIIToUTF16("undefined") : path.LossyDisplayName());
 
     extensions::ExtensionPrefs* extension_prefs =
         extensions::ExtensionPrefs::Get(profile_);
@@ -417,7 +365,7 @@ class VoiceSearchDomHandler : public WebUIMessageHandler {
 #endif
   }
 
-  Profile* profile_;
+  Profile* const profile_;
   base::WeakPtrFactory<VoiceSearchDomHandler> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(VoiceSearchDomHandler);
@@ -434,7 +382,7 @@ class VoiceSearchDomHandler : public WebUIMessageHandler {
 VoiceSearchUI::VoiceSearchUI(content::WebUI* web_ui)
     : content::WebUIController(web_ui) {
   Profile* profile = Profile::FromWebUI(web_ui);
-  web_ui->AddMessageHandler(base::MakeUnique<VoiceSearchDomHandler>(profile));
+  web_ui->AddMessageHandler(std::make_unique<VoiceSearchDomHandler>(profile));
 
   // Set up the about:voicesearch source.
   content::WebUIDataSource::Add(profile, CreateVoiceSearchUiHtmlSource());

chrome/browser/ui/webui/voice_search_ui.h → chrome/browser/ui/webui/chromeos/voice_search_ui.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_UI_WEBUI_VOICE_SEARCH_UI_H_
-#define CHROME_BROWSER_UI_WEBUI_VOICE_SEARCH_UI_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_VOICE_SEARCH_UI_H_
+#define CHROME_BROWSER_UI_WEBUI_CHROMEOS_VOICE_SEARCH_UI_H_
 
 #include "base/macros.h"
 #include "content/public/browser/web_ui_controller.h"
@@ -18,4 +18,4 @@ class VoiceSearchUI : public content::WebUIController {
   DISALLOW_COPY_AND_ASSIGN(VoiceSearchUI);
 };
 
-#endif  // CHROME_BROWSER_UI_WEBUI_VOICE_SEARCH_UI_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_CHROMEOS_VOICE_SEARCH_UI_H_

chrome/common/url_constants.cc

@@ -94,7 +94,6 @@ const char kChromeUISuggestionsURL[] = "chrome://suggestions/";
 const char kChromeUISupervisedUserPassphrasePageURL[] =
     "chrome://managed-user-passphrase/";
 const char kChromeUISyncConfirmationURL[] = "chrome://sync-confirmation/";
-const char kChromeUISysInternalsURL[] = "chrome://sys-internals/";
 const char kChromeUITermsURL[] = "chrome://terms/";
 const char kChromeUIThemeURL[] = "chrome://theme/";
 const char kChromeUIThumbnailURL[] = "chrome://thumb/";
@@ -135,6 +134,7 @@ const char kChromeUIScreenlockIconURL[] = "chrome://screenlock-icon/";
 const char kChromeUISetTimeURL[] = "chrome://set-time/";
 const char kChromeUISimUnlockURL[] = "chrome://sim-unlock/";
 const char kChromeUISlowURL[] = "chrome://slow/";
+const char kChromeUISysInternalsURL[] = "chrome://sys-internals/";
 const char kChromeUISystemInfoURL[] = "chrome://system/";
 const char kChromeUITermsOemURL[] = "chrome://terms/oem";
 const char kChromeUIUserImageURL[] = "chrome://userimage/";
@@ -257,7 +257,6 @@ const char kChromeUISyncHost[] = "sync";
 const char kChromeUISyncFileSystemInternalsHost[] = "syncfs-internals";
 const char kChromeUISyncInternalsHost[] = "sync-internals";
 const char kChromeUISyncResourcesHost[] = "syncresources";
-const char kChromeUISysInternalsHost[] = "sys-internals";
 const char kChromeUISystemInfoHost[] = "system";
 const char kChromeUITaskSchedulerInternalsHost[] = "taskscheduler-internals";
 const char kChromeUITermsHost[] = "terms";
@@ -323,6 +322,7 @@ const char kChromeUISetTimeHost[] = "set-time";
 const char kChromeUISimUnlockHost[] = "sim-unlock";
 const char kChromeUISlowHost[] = "slow";
 const char kChromeUISlowTraceHost[] = "slow_trace";
+const char kChromeUISysInternalsHost[] = "sys-internals";
 const char kChromeUIUserImageHost[] = "userimage";
 const char kChromeUIVoiceSearchHost[] = "voicesearch";
 

chrome/common/url_constants.h

@@ -86,7 +86,6 @@ extern const char kChromeUISiteEngagementHost[];
 extern const char kChromeUISuggestionsURL[];
 extern const char kChromeUISupervisedUserPassphrasePageURL[];
 extern const char kChromeUISyncConfirmationURL[];
-extern const char kChromeUISysInternalsURL[];
 extern const char kChromeUITermsURL[];
 extern const char kChromeUIThemeURL[];
 extern const char kChromeUIThumbnailURL[];
@@ -124,6 +123,7 @@ extern const char kChromeUIScreenlockIconURL[];
 extern const char kChromeUISetTimeURL[];
 extern const char kChromeUISimUnlockURL[];
 extern const char kChromeUISlowURL[];
+extern const char kChromeUISysInternalsURL[];
 extern const char kChromeUISystemInfoURL[];
 extern const char kChromeUITermsOemURL[];
 extern const char kChromeUIUserImageURL[];
@@ -240,7 +240,6 @@ extern const char kChromeUISyncHost[];
 extern const char kChromeUISyncFileSystemInternalsHost[];
 extern const char kChromeUISyncInternalsHost[];
 extern const char kChromeUISyncResourcesHost[];
-extern const char kChromeUISysInternalsHost[];
 extern const char kChromeUISystemInfoHost[];
 extern const char kChromeUITaskSchedulerInternalsHost[];
 extern const char kChromeUITermsHost[];
@@ -306,6 +305,7 @@ extern const char kChromeUISetTimeHost[];
 extern const char kChromeUISimUnlockHost[];
 extern const char kChromeUISlowHost[];
 extern const char kChromeUISlowTraceHost[];
+extern const char kChromeUISysInternalsHost[];
 extern const char kChromeUIUserImageHost[];
 extern const char kChromeUIVoiceSearchHost[];
 

third_party/closure_compiler/compiled_resources2.gyp

@@ -22,6 +22,7 @@
         '<(DEPTH)/chrome/browser/resources/chromeos/quick_unlock/compiled_resources2.gyp:*',
         '<(DEPTH)/chrome/browser/resources/chromeos/select_to_speak/compiled_resources2.gyp:*',
         '<(DEPTH)/chrome/browser/resources/chromeos/switch_access/compiled_resources2.gyp:*',
+        '<(DEPTH)/chrome/browser/resources/chromeos/sys_internals/compiled_resources2.gyp:*',
         '<(DEPTH)/chrome/browser/resources/download_internals/compiled_resources2.gyp:*',
         '<(DEPTH)/chrome/browser/resources/extensions/compiled_resources2.gyp:*',
         '<(DEPTH)/chrome/browser/resources/md_bookmarks/compiled_resources2.gyp:*',
@@ -36,7 +37,6 @@
         '<(DEPTH)/chrome/browser/resources/pdf/compiled_resources2.gyp:*',
         '<(DEPTH)/chrome/browser/resources/print_preview/compiled_resources2.gyp:*',
         '<(DEPTH)/chrome/browser/resources/settings/compiled_resources2.gyp:*',
-        '<(DEPTH)/chrome/browser/resources/sys_internals/compiled_resources2.gyp:*',
         '<(DEPTH)/chrome/browser/resources/webapks/compiled_resources2.gyp:*',
         '<(DEPTH)/ui/file_manager/compiled_resources2.gyp:*',
         '<(DEPTH)/ui/webui/resources/cr_components/compiled_resources2.gyp:*',