Make ui_resources IDRs accessible via chrome://theme/<IDR>.

chrome/browser/resources_util_unittest.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/resources_util.h"
 
 #include "grit/theme_resources.h"
+#include "grit/ui_resources.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-namespace {
-
-struct TestCase {
-  const char* name;
-  int id;
-};
-
-}  // namespace
-
 TEST(ResourcesUtil, SpotCheckIds) {
-  const TestCase kTestCases[] = {
+  const struct {
+    const char* name;
+    int id;
+  } cases[] = {

[oshima, 2013/01/08 22:36:34]

shouldn't this still be kTestCases as it's still const?

[msw, 2013/01/08 23:07:37]

Done. For some reason, I thought I had seen the opposite recommendation for
local const identifiers.

[oshima, 2013/01/08 23:10:27]

If that's recommended style, then I'm fine. I just wasn't aware of it.

+    // IDRs from chrome/app/theme/theme_resources.grd should be valid.
     {"IDR_BACK", IDR_BACK},
     {"IDR_STOP", IDR_STOP},
-    {"IDR_OMNIBOX_STAR", IDR_OMNIBOX_STAR},
-    {"IDR_SAD_TAB", IDR_SAD_TAB},
+    // IDRs from ui/resources/ui_resources.grd should be valid.
+    {"IDR_CHECKMARK", IDR_CHECKMARK},
+    {"IDR_THROBBER", IDR_THROBBER},
+    // Unknown names should be invalid and return -1.
+    {"foobar", -1},
+    {"backstar", -1},
   };
-  for (size_t i = 0; i < arraysize(kTestCases); ++i) {
-    EXPECT_EQ(kTestCases[i].id,
-              ResourcesUtil::GetThemeResourceId(kTestCases[i].name));
-  }
 
-  // Should return -1 of unknown names.
-  EXPECT_EQ(-1, ResourcesUtil::GetThemeResourceId("foobar"));
-  EXPECT_EQ(-1, ResourcesUtil::GetThemeResourceId("backstar"));
+  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(cases); ++i)
+    EXPECT_EQ(cases[i].id, ResourcesUtil::GetThemeResourceId(cases[i].name));
 }