[Part 3 of 6] Switch ColumnSpecifier to enum class. This makes straddling namespaces easier.

chrome/browser/task_manager/task_manager_browsertest.cc

 // Copyright (c) 2012 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 "chrome/browser/task_manager/task_manager.h"
 
 #include <stddef.h>
 
 #include "base/files/file_path.h"
 #include "base/macros.h"
@@ skipping 33 matching lines @@
 #include "content/public/test/content_browser_test_utils.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/common/extension.h"
 #include "net/dns/mock_host_resolver.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/page_transition_types.h"
 
 using content::WebContents;
+using task_manager::browsertest_util::ColumnSpecifier;
 using task_manager::browsertest_util::MatchAboutBlankTab;
 using task_manager::browsertest_util::MatchAnyApp;
 using task_manager::browsertest_util::MatchAnyExtension;
 using task_manager::browsertest_util::MatchAnySubframe;
 using task_manager::browsertest_util::MatchAnyTab;
 using task_manager::browsertest_util::MatchAnyUtility;
 using task_manager::browsertest_util::MatchApp;
 using task_manager::browsertest_util::MatchExtension;
 using task_manager::browsertest_util::MatchSubframe;
 using task_manager::browsertest_util::MatchTab;
@@ skipping 753 matching lines @@
     ReloadExtension(extension_id);
     ASSERT_NO_FATAL_FAILURE(
         WaitForTaskManagerRows(1, MatchExtension("background_page")));
   }
 }
 
 // Checks that task manager counts a worker thread JS heap size.
 // http://crbug.com/241066
 IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, WebWorkerJSHeapMemory) {
   ShowTaskManager();
-  model()->ToggleColumnVisibility(task_manager::browsertest_util::V8_MEMORY);
+  model()->ToggleColumnVisibility(ColumnSpecifier::V8_MEMORY);
   ui_test_utils::NavigateToURL(browser(), GetTestURL());
   size_t minimal_heap_size = 4 * 1024 * 1024 * sizeof(void*);
   std::string test_js = base::StringPrintf(
       "var blob = new Blob([\n"
       "    'mem = new Array(%lu);',\n"
       "    'for (var i = 0; i < mem.length; i += 16)',"
       "    '  mem[i] = i;',\n"
       "    'postMessage(\"okay\");']);\n"
       "blobURL = window.URL.createObjectURL(blob);\n"
       "var worker = new Worker(blobURL);\n"
       "worker.addEventListener('message', function(e) {\n"
       "  window.domAutomationController.send(e.data);\n"  // e.data == "okay"
       "});\n"
       "worker.postMessage('go');\n",
       static_cast<unsigned long>(minimal_heap_size));
   std::string ok;
   ASSERT_TRUE(content::ExecuteScriptAndExtractString(
       browser()->tab_strip_model()->GetActiveWebContents(), test_js, &ok));
   ASSERT_EQ("okay", ok);
 
   // The worker has allocated objects of at least |minimal_heap_size| bytes.
   // Wait for the heap stats to reflect this.
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerStatToExceed(
-      MatchTab("title1.html"), task_manager::browsertest_util::V8_MEMORY,
-      minimal_heap_size));
+      MatchTab("title1.html"), ColumnSpecifier::V8_MEMORY, minimal_heap_size));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerStatToExceed(
-      MatchTab("title1.html"), task_manager::browsertest_util::V8_MEMORY_USED,
+      MatchTab("title1.html"), ColumnSpecifier::V8_MEMORY_USED,
       minimal_heap_size));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyTab()));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchTab("title1.html")));
 }
 
 // Checks that task manager counts renderer JS heap size.
 IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, JSHeapMemory) {
   ShowTaskManager();
   ui_test_utils::NavigateToURL(browser(), GetTestURL());
   size_t minimal_heap_size = 4 * 1024 * 1024 * sizeof(void*);
   std::string test_js = base::StringPrintf(
       "mem = new Array(%lu);\n"
       "for (var i = 0; i < mem.length; i += 16)\n"
       "  mem[i] = i;\n"
       "window.domAutomationController.send(\"okay\");\n",
       static_cast<unsigned long>(minimal_heap_size));
   std::string ok;
   ASSERT_TRUE(content::ExecuteScriptAndExtractString(
       browser()->tab_strip_model()->GetActiveWebContents(), test_js, &ok));
   ASSERT_EQ("okay", ok);
 
-  model()->ToggleColumnVisibility(task_manager::browsertest_util::V8_MEMORY);
+  model()->ToggleColumnVisibility(ColumnSpecifier::V8_MEMORY);
 
   // The page's js has allocated objects of at least |minimal_heap_size| bytes.
   // Wait for the heap stats to reflect this.
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerStatToExceed(
-      MatchTab("title1.html"), task_manager::browsertest_util::V8_MEMORY,
-      minimal_heap_size));
+      MatchTab("title1.html"), ColumnSpecifier::V8_MEMORY, minimal_heap_size));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerStatToExceed(
-      MatchTab("title1.html"), task_manager::browsertest_util::V8_MEMORY_USED,
+      MatchTab("title1.html"), ColumnSpecifier::V8_MEMORY_USED,
       minimal_heap_size));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyTab()));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchTab("title1.html")));
 }
 
 // Checks that task manager counts utility process JS heap size.
 IN_PROC_BROWSER_TEST_F(TaskManagerUtilityProcessBrowserTest,
                        UtilityJSHeapMemory) {
   ShowTaskManager();
-  model()->ToggleColumnVisibility(task_manager::browsertest_util::V8_MEMORY);
+  model()->ToggleColumnVisibility(ColumnSpecifier::V8_MEMORY);
 
   auto proxy_resolver_name =
       l10n_util::GetStringUTF16(IDS_UTILITY_PROCESS_PROXY_RESOLVER_NAME);
   ui_test_utils::NavigateToURL(browser(), GetTestURL());
   // The PAC script is trivial, so don't expect a large heap.
   size_t minimal_heap_size = 1024;
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerStatToExceed(
-      MatchUtility(proxy_resolver_name),
-      task_manager::browsertest_util::V8_MEMORY, minimal_heap_size));
+      MatchUtility(proxy_resolver_name), ColumnSpecifier::V8_MEMORY,
+      minimal_heap_size));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerStatToExceed(
-      MatchUtility(proxy_resolver_name),
-      task_manager::browsertest_util::V8_MEMORY_USED, minimal_heap_size));
+      MatchUtility(proxy_resolver_name), ColumnSpecifier::V8_MEMORY_USED,
+      minimal_heap_size));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyUtility()));
   ASSERT_NO_FATAL_FAILURE(
       WaitForTaskManagerRows(1, MatchUtility(proxy_resolver_name)));
 }
 
 IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, DevToolsNewDockedWindow) {
   // TODO(nick, afakhry): Broken on new task manager because we show
   // a long chrome-devtools:// URL without a prefix (expecting "Tab: *").
   DisableNewTaskManagerForBrokenTest();
 
@@ skipping 317 matching lines @@
       WaitForTaskManagerRows(1, MatchTab("Title Of Awesomeness")));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(0, MatchAnySubframe()));
 
   HideTaskManager();
   ShowTaskManager();
 
   ASSERT_NO_FATAL_FAILURE(
       WaitForTaskManagerRows(1, MatchTab("Title Of Awesomeness")));
   ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(0, MatchAnySubframe()));
 }