Try 2: Completely redo how themes are stored on disk and processed at install time.

Same as previous patch, except we now have a
BrowserThemeProvider::GetDefaultDisplayProperty() so we don't have UMRs in
ntp_resource_cache.cc.

BUG=24493,21121
TEST=All the new unit tests pass. All the complex theme startup tests go faster.

Previous Review URL: http://codereview.chromium.org/460050

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

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

8 files changed, 1 insertions, 32 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
deleted file mode 100644
index c1099db..0000000
--- a/chrome/test/data/profiles/complex_theme/Default/Cached Theme Images/theme_frame_inactive
+++ /dev/null
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
deleted file mode 100644
index 5d73cfd..0000000
--- a/chrome/test/data/profiles/complex_theme/Default/Cached Theme Images/theme_frame_incognito
+++ /dev/null
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
deleted file mode 100644
index 78b69a4..0000000
--- a/chrome/test/data/profiles/complex_theme/Default/Cached Theme Images/theme_frame_incognito_inactive
+++ /dev/null
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
deleted file mode 100644
index fbd9a95..0000000
--- a/chrome/test/data/profiles/complex_theme/Default/Cached Theme Images/theme_frame_original
+++ /dev/null
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
deleted file mode 100644
index be17ca5..0000000
--- a/chrome/test/data/profiles/complex_theme/Default/Cached Theme Images/theme_tab_background_incognito
+++ /dev/null
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
deleted file mode 100644
index 90cc6b4..0000000
--- a/chrome/test/data/profiles/complex_theme/Default/Cached Theme Images/theme_tab_background_original
+++ /dev/null
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
new file mode 100644
index 0000000..0a76cb9
--- /dev/null
+++ b/chrome/test/data/profiles/complex_theme/Default/Extensions/mblmlcbknbnfebdfjnolmcapmdofhmme/1.1/Cached Theme.pak
diff --git a/chrome/test/data/profiles/complex_theme/Default/PreferencesTemplate b/chrome/test/data/profiles/complex_theme/Default/PreferencesTemplate
index f869914..7c3eb03 100644
--- a/chrome/test/data/profiles/complex_theme/Default/PreferencesTemplate
+++ b/chrome/test/data/profiles/complex_theme/Default/PreferencesTemplate
@@ -50,39 +50,8 @@
          }
       },
       "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",
-         "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 ]
-         }
+         "pack": "$1/Default/Extensions/mblmlcbknbnfebdfjnolmcapmdofhmme/1.1/Cached Theme.pak"
       }
    },
    "profile": {