Revert "Completely redo how themes are stored on disk and processed at install

time," as it fails valgrind tests.

This reverts commit 86faccd1028937a69ccc718718fd48c06c0cd471 (r34379).

Review URL: http://codereview.chromium.org/490025

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34385 0039d316-1c4b-4281-b951-d872f2087c98

8 files changed, 32 insertions, 1 deletions

diff --git a/chrome/test/data/profiles/complex_theme/Default/Cached Theme Images/theme_frame_inactive b/chrome/test/data/profiles/complex_theme/Default/Cached Theme Images/theme_frame_inactive
new file mode 100644
index 0000000..c1099db
--- /dev/null
+++ b/chrome/test/data/profiles/complex_theme/Default/Cached Theme Images/theme_frame_inactive
diff --git a/chrome/test/data/profiles/complex_theme/Default/Cached Theme Images/theme_frame_incognito b/chrome/test/data/profiles/complex_theme/Default/Cached Theme Images/theme_frame_incognito
new file mode 100644
index 0000000..5d73cfd
--- /dev/null
+++ b/chrome/test/data/profiles/complex_theme/Default/Cached Theme Images/theme_frame_incognito
diff --git a/chrome/test/data/profiles/complex_theme/Default/Cached Theme Images/theme_frame_incognito_inactive b/chrome/test/data/profiles/complex_theme/Default/Cached Theme Images/theme_frame_incognito_inactive
new file mode 100644
index 0000000..78b69a4
--- /dev/null
+++ b/chrome/test/data/profiles/complex_theme/Default/Cached Theme Images/theme_frame_incognito_inactive
diff --git a/chrome/test/data/profiles/complex_theme/Default/Cached Theme Images/theme_frame_original b/chrome/test/data/profiles/complex_theme/Default/Cached Theme Images/theme_frame_original
new file mode 100644
index 0000000..fbd9a95
--- /dev/null
+++ b/chrome/test/data/profiles/complex_theme/Default/Cached Theme Images/theme_frame_original
diff --git a/chrome/test/data/profiles/complex_theme/Default/Cached Theme Images/theme_tab_background_incognito b/chrome/test/data/profiles/complex_theme/Default/Cached Theme Images/theme_tab_background_incognito
new file mode 100644
index 0000000..be17ca5
--- /dev/null
+++ b/chrome/test/data/profiles/complex_theme/Default/Cached Theme Images/theme_tab_background_incognito
diff --git a/chrome/test/data/profiles/complex_theme/Default/Cached Theme Images/theme_tab_background_original b/chrome/test/data/profiles/complex_theme/Default/Cached Theme Images/theme_tab_background_original
new file mode 100644
index 0000000..90cc6b4
--- /dev/null
+++ b/chrome/test/data/profiles/complex_theme/Default/Cached Theme Images/theme_tab_background_original
diff --git a/chrome/test/data/profiles/complex_theme/Default/Extensions/mblmlcbknbnfebdfjnolmcapmdofhmme/1.1/Cached Theme.pak b/chrome/test/data/profiles/complex_theme/Default/Extensions/mblmlcbknbnfebdfjnolmcapmdofhmme/1.1/Cached Theme.pak
deleted file mode 100644
index 0a76cb9..0000000
--- a/chrome/test/data/profiles/complex_theme/Default/Extensions/mblmlcbknbnfebdfjnolmcapmdofhmme/1.1/Cached Theme.pak
+++ /dev/null
diff --git a/chrome/test/data/profiles/complex_theme/Default/PreferencesTemplate b/chrome/test/data/profiles/complex_theme/Default/PreferencesTemplate
index 7c3eb03..f869914 100644
--- a/chrome/test/data/profiles/complex_theme/Default/PreferencesTemplate
+++ b/chrome/test/data/profiles/complex_theme/Default/PreferencesTemplate
@@ -50,8 +50,39 @@
          }
       },
       "theme": {
+         "colors": {
+            "bookmark_text": [ 0, 0, 0 ],
+            "frame": [ 57, 137, 194 ],
+            "ntp_background": [ 57, 137, 194 ],
+            "ntp_link": [ 0, 0, 0 ],
+            "ntp_section": [ 131, 138, 146, 0.8 ],
+            "ntp_section_link": [ 255, 255, 255 ],
+            "ntp_section_text": [ 255, 255, 255 ],
+            "ntp_text": [ 0, 0, 0 ],
+            "tab_background_text": [ 0, 0, 0 ],
+            "tab_text": [ 0, 0, 0 ],
+            "toolbar": [ 204, 208, 212 ]
+         },
          "id": "mblmlcbknbnfebdfjnolmcapmdofhmme",
-         "pack": "$1/Default/Extensions/mblmlcbknbnfebdfjnolmcapmdofhmme/1.1/Cached Theme.pak"
+         "images": {
+            "theme_button_background": "$1/Default/Extensions/mblmlcbknbnfebdfjnolmcapmdofhmme/1.1/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYwsgCDA",
+            "theme_frame": "$1/Default/Cached Theme Images/theme_frame_original",
+            "theme_frame_inactive": "$1/Default/Cached Theme Images/theme_frame_inactive",
+            "theme_frame_incognito": "$1/Default/Cached Theme Images/theme_frame_incognito",
+            "theme_frame_incognito_inactive": "$1/Default/Cached Theme Images/theme_frame_incognito_inactive",
+            "theme_ntp_background": "$1/Default/Extensions/mblmlcbknbnfebdfjnolmcapmdofhmme/1.1/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYj9gCDA",
+            "theme_tab_background": "$1/Default/Cached Theme Images/theme_tab_background_original",
+            "theme_tab_background_incognito": "$1/Default/Cached Theme Images/theme_tab_background_incognito",
+            "theme_toolbar": "$1/Default/Extensions/mblmlcbknbnfebdfjnolmcapmdofhmme/1.1/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYnMgCDA",
+            "theme_window_control_background": "$1/Default/Extensions/mblmlcbknbnfebdfjnolmcapmdofhmme/1.1/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYjNgCDA"
+         },
+         "properties": {
+            "ntp_background_alignment": "top",
+            "ntp_background_repeat": "no-repeat"
+         },
+         "tints": {
+            "buttons": [ 0.6, 0.553, 0.5 ]
+         }
       }
    },
    "profile": {