Don't store IDR ids in ThemePack files as they change whenever the grd is modified.

chrome/browser/browser_theme_pack_unittest.cc

 // Copyright (c) 2009 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/browser_theme_pack.h"
 
 #include "app/gfx/color_utils.h"
 #include "app/theme_provider.h"
 #include "base/file_util.h"
 #include "base/json/json_reader.h"
@@ skipping 87 matching lines @@
   void LoadDisplayPropertiesJSON(const std::string& json) {
     scoped_ptr<Value> value(base::JSONReader::Read(json, false));
     ASSERT_TRUE(value->IsType(Value::TYPE_DICTIONARY));
     LoadDisplayPropertiesDictionary(static_cast<DictionaryValue*>(value.get()));
   }
 
   void LoadDisplayPropertiesDictionary(DictionaryValue* value) {
     theme_pack_->BuildDisplayPropertiesFromJSON(value);
   }
 
-  void ParseImageNames(const std::string& json,
+  void ParseImageNamesJSON(const std::string& json,
                        std::map<int, FilePath>* out_file_paths) {
     scoped_ptr<Value> value(base::JSONReader::Read(json, false));
     ASSERT_TRUE(value->IsType(Value::TYPE_DICTIONARY));
-    theme_pack_->ParseImageNamesFromJSON(
-        static_cast<DictionaryValue*>(value.get()),
-        FilePath(), out_file_paths);
+    ParseImageNamesDictionary(static_cast<DictionaryValue*>(value.get()),
+                              out_file_paths);
+  }
+
+  void ParseImageNamesDictionary(DictionaryValue* value,
+                                 std::map<int, FilePath>* out_file_paths) {
+    theme_pack_->ParseImageNamesFromJSON(value, FilePath(), out_file_paths);
   }
 
   FilePath GetStarGazingPath() {
     FilePath test_path;
     if (!PathService::Get(chrome::DIR_TEST_DATA, &test_path)) {
       NOTREACHED();
       return test_path;
     }
 
     test_path = test_path.AppendASCII("profiles");
@@ skipping 24 matching lines @@
     EXPECT_TRUE(pack->GetTint(BrowserThemeProvider::TINT_BUTTONS, &actual));
     EXPECT_DOUBLE_EQ(expected.h, actual.h);
     EXPECT_DOUBLE_EQ(expected.s, actual.s);
     EXPECT_DOUBLE_EQ(expected.l, actual.l);
 
     int val;
     EXPECT_TRUE(pack->GetDisplayProperty(
         BrowserThemeProvider::NTP_BACKGROUND_ALIGNMENT, &val));
     EXPECT_EQ(BrowserThemeProvider::ALIGN_TOP, val);
 
+    // Every theme should have the following images, because they need to be
+    // tinted.
     EXPECT_TRUE(pack->HasCustomImage(IDR_THEME_FRAME));
+    EXPECT_TRUE(pack->HasCustomImage(IDR_THEME_FRAME_INACTIVE));
+    EXPECT_TRUE(pack->HasCustomImage(IDR_THEME_FRAME_INCOGNITO));
+    EXPECT_TRUE(pack->HasCustomImage(IDR_THEME_FRAME_INCOGNITO_INACTIVE));
+    EXPECT_TRUE(pack->HasCustomImage(IDR_THEME_TAB_BACKGROUND));
+    EXPECT_TRUE(pack->HasCustomImage(IDR_THEME_TAB_BACKGROUND_INCOGNITO));
 
     // Make sure we don't have phantom data.
     EXPECT_FALSE(pack->GetColor(BrowserThemeProvider::COLOR_CONTROL_BACKGROUND,
                                 &color));
     EXPECT_FALSE(pack->GetTint(BrowserThemeProvider::TINT_FRAME, &actual));
   }
 
   MessageLoop message_loop;
   ChromeThread fake_ui_thread;
   ChromeThread fake_file_thread;
@@ skipping 93 matching lines @@
   EXPECT_TRUE(theme_pack_->GetDisplayProperty(
       BrowserThemeProvider::NTP_BACKGROUND_TILING, &out_val));
   EXPECT_EQ(BrowserThemeProvider::REPEAT_X, out_val);
 
   EXPECT_TRUE(theme_pack_->GetDisplayProperty(
       BrowserThemeProvider::NTP_LOGO_ALTERNATE, &out_val));
   EXPECT_EQ(0, out_val);
 }
 
 TEST_F(BrowserThemePackTest, CanParsePaths) {
-  std::string tint_json = "{ \"theme_button_background\": \"one\", "
+  std::string path_json = "{ \"theme_button_background\": \"one\", "
                           "  \"theme_toolbar\": \"two\" }";
   std::map<int, FilePath> out_file_paths;
-  ParseImageNames(tint_json, &out_file_paths);
+  ParseImageNamesJSON(path_json, &out_file_paths);
 
   EXPECT_EQ(2u, out_file_paths.size());
-  EXPECT_TRUE(FilePath(FILE_PATH_LITERAL("one")) == out_file_paths[
-      ThemeResourcesUtil::GetId("theme_button_background")]);
-  EXPECT_TRUE(FilePath(FILE_PATH_LITERAL("two")) ==
-            out_file_paths[ThemeResourcesUtil::GetId("theme_toolbar")]);
+  // "12" and "5" are internal constants to BrowserThemePack and are
+  // PRS_THEME_BUTTON_BACKGROUND and PRS_THEME_TOOLBAR, but they are
+  // implementation details that shouldn't be exported.
+  EXPECT_TRUE(FilePath(FILE_PATH_LITERAL("one")) == out_file_paths[12]);
+  EXPECT_TRUE(FilePath(FILE_PATH_LITERAL("two")) == out_file_paths[5]);
+}
+
+TEST_F(BrowserThemePackTest, InvalidPathNames) {
+  std::string path_json = "{ \"wrong\": [1], "
+                          "  \"theme_button_background\": \"one\", "
+                          "  \"not_a_thing\": \"blah\" }";
+  std::map<int, FilePath> out_file_paths;
+  ParseImageNamesJSON(path_json, &out_file_paths);
+
+  // We should have only parsed one valid path out of that mess above.
+  EXPECT_EQ(1u, out_file_paths.size());
 }
 
 TEST_F(BrowserThemePackTest, InvalidColors) {
   std::string invalid_color = "{ \"toolbar\": [\"dog\", \"cat\", [12]], "
                               "  \"sound\": \"woof\" }";
   LoadColorJSON(invalid_color);
   std::map<int, SkColor> colors = GetDefaultColorMap();
   VerifyColorMap(colors);
 }
 
@@ skipping 12 matching lines @@
   std::string invalid_properties = "{ \"ntp_background_alignment\": [15], "
                                    "  \"junk\": [15.3] }";
   LoadDisplayPropertiesJSON(invalid_properties);
 
   int out_val;
   EXPECT_FALSE(theme_pack_->GetDisplayProperty(
       BrowserThemeProvider::NTP_BACKGROUND_ALIGNMENT, &out_val));
 }
 
 // These three tests should just not cause a segmentation fault.
+TEST_F(BrowserThemePackTest, NullPaths) {
+  std::map<int, FilePath> out_file_paths;
+  ParseImageNamesDictionary(NULL, &out_file_paths);
+}
+
 TEST_F(BrowserThemePackTest, NullTints) {
   LoadTintDictionary(NULL);
 }
 
 TEST_F(BrowserThemePackTest, NullColors) {
   LoadColorDictionary(NULL);
 }
 
 TEST_F(BrowserThemePackTest, NullDisplayProperties) {
   LoadDisplayPropertiesDictionary(NULL);
@@ skipping 32 matching lines @@
 
   // Part 2: Try to read back the data pack that we just wrote to disk.
   {
     scoped_refptr<BrowserThemePack> pack =
         BrowserThemePack::BuildFromDataPack(
             file, "mblmlcbknbnfebdfjnolmcapmdofhmme");
     ASSERT_TRUE(pack.get());
     VerifyStarGazing(pack.get());
   }
 }