Cleanup: Extract icon related methods outside of util.js

chrome/test/data/webui/webui_resource_browsertest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <vector>
 
 #include "base/path_service.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/grit/options_test_resources.h"
@@ skipping 217 matching lines @@
   LoadFile(base::FilePath(FILE_PATH_LITERAL("menu_button_test.html")));
 }
 
 IN_PROC_BROWSER_TEST_F(WebUIResourceBrowserTest, SplitterTest) {
   AddLibrary(IDR_WEBUI_JS_CR);
   AddLibrary(IDR_WEBUI_JS_CR_UI);
   AddLibrary(IDR_WEBUI_JS_CR_UI_SPLITTER);
   LoadFile(base::FilePath(FILE_PATH_LITERAL("splitter_test.html")));
 }
 
 IN_PROC_BROWSER_TEST_F(WebUIResourceBrowserTest, UtilTest) {

[Dan Beam, 2016/05/06 22:39:06]

doesn't this need a:

  AddLibrary(IDR_WEBUI_JS_CR);

above it like previously?

[dpapad, 2016/05/06 22:56:33]

Strictly speaking it is not needed. The non-favicon related tests of
util_test.html do not exercise any code that depends on cr.js. I had actually
added this line at
https://codereview.chromium.org/1914073005/diff/60001/chrome/test/data/webui/...,
when I added favicon related tests.

[Dan Beam, 2016/05/06 23:01:55]

Acknowledged.

+  AddLibrary(IDR_WEBUI_JS_UTIL);
+  LoadFile(base::FilePath(FILE_PATH_LITERAL("util_test.html")));
+}
+
+IN_PROC_BROWSER_TEST_F(WebUIResourceBrowserTest, IconTest) {
   AddLibrary(IDR_WEBUI_JS_CR);
   AddLibrary(IDR_WEBUI_JS_UTIL);
-  LoadFile(base::FilePath(FILE_PATH_LITERAL("util_test.html")));
+  AddLibrary(IDR_WEBUI_JS_ICON);
+  LoadFile(base::FilePath(FILE_PATH_LITERAL("icon_test.html")));
 }
 
 IN_PROC_BROWSER_TEST_F(WebUIResourceBrowserTest, PromiseResolverTest) {
   AddLibrary(IDR_WEBUI_JS_ASSERT);
   AddLibrary(IDR_WEBUI_JS_PROMISE_RESOLVER);
   LoadFile(base::FilePath(FILE_PATH_LITERAL("promise_resolver_test.html")));
 }