Bring startup test for complex theme up to date.

BUG= http://crbug.com/23436
TEST= Run startup tests with complex theme; note that complex theme is correctly displayed.


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

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

10 files changed, 6 insertions, 62 deletions

diff --git a/chrome/test/data/profiles/complex_theme/Default/Extensions/mblmlcbknbnfebdfjnolmcapmdofhmme/1.1/i/theme_frame_inactive b/chrome/test/data/profiles/complex_theme/Default/Cached Theme Images/theme_frame_inactive
index c1099db..c1099db 100644
--- a/chrome/test/data/profiles/complex_theme/Default/Extensions/mblmlcbknbnfebdfjnolmcapmdofhmme/1.1/i/theme_frame_inactive
+++ b/chrome/test/data/profiles/complex_theme/Default/Cached Theme Images/theme_frame_inactive
diff --git a/chrome/test/data/profiles/complex_theme/Default/Extensions/mblmlcbknbnfebdfjnolmcapmdofhmme/1.1/i/theme_frame_incognito b/chrome/test/data/profiles/complex_theme/Default/Cached Theme Images/theme_frame_incognito
index 5d73cfd..5d73cfd 100644
--- a/chrome/test/data/profiles/complex_theme/Default/Extensions/mblmlcbknbnfebdfjnolmcapmdofhmme/1.1/i/theme_frame_incognito
+++ b/chrome/test/data/profiles/complex_theme/Default/Cached Theme Images/theme_frame_incognito
diff --git a/chrome/test/data/profiles/complex_theme/Default/Extensions/mblmlcbknbnfebdfjnolmcapmdofhmme/1.1/i/theme_frame_incognito_inactive b/chrome/test/data/profiles/complex_theme/Default/Cached Theme Images/theme_frame_incognito_inactive
index 78b69a4..78b69a4 100644
--- a/chrome/test/data/profiles/complex_theme/Default/Extensions/mblmlcbknbnfebdfjnolmcapmdofhmme/1.1/i/theme_frame_incognito_inactive
+++ 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/Extensions/mblmlcbknbnfebdfjnolmcapmdofhmme/1.1/i/theme_frame b/chrome/test/data/profiles/complex_theme/Default/Cached Theme Images/theme_frame_original
index fbd9a95..fbd9a95 100644
--- a/chrome/test/data/profiles/complex_theme/Default/Extensions/mblmlcbknbnfebdfjnolmcapmdofhmme/1.1/i/theme_frame
+++ b/chrome/test/data/profiles/complex_theme/Default/Cached Theme Images/theme_frame_original
diff --git a/chrome/test/data/profiles/complex_theme/Default/Extensions/mblmlcbknbnfebdfjnolmcapmdofhmme/1.1/i/theme_tab_background_incognito b/chrome/test/data/profiles/complex_theme/Default/Cached Theme Images/theme_tab_background_incognito
index be17ca5..be17ca5 100644
--- a/chrome/test/data/profiles/complex_theme/Default/Extensions/mblmlcbknbnfebdfjnolmcapmdofhmme/1.1/i/theme_tab_background_incognito
+++ 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/Extensions/mblmlcbknbnfebdfjnolmcapmdofhmme/1.1/i/theme_tab_background b/chrome/test/data/profiles/complex_theme/Default/Cached Theme Images/theme_tab_background_original
index 90cc6b4..90cc6b4 100644
--- a/chrome/test/data/profiles/complex_theme/Default/Extensions/mblmlcbknbnfebdfjnolmcapmdofhmme/1.1/i/theme_tab_background
+++ 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/i/theme_frame_overlay b/chrome/test/data/profiles/complex_theme/Default/Extensions/mblmlcbknbnfebdfjnolmcapmdofhmme/1.1/i/theme_frame_overlay
deleted file mode 100644
index 1893d56..0000000
--- a/chrome/test/data/profiles/complex_theme/Default/Extensions/mblmlcbknbnfebdfjnolmcapmdofhmme/1.1/i/theme_frame_overlay
+++ /dev/null
diff --git a/chrome/test/data/profiles/complex_theme/Default/Extensions/mblmlcbknbnfebdfjnolmcapmdofhmme/1.1/i/theme_frame_overlay_inactive b/chrome/test/data/profiles/complex_theme/Default/Extensions/mblmlcbknbnfebdfjnolmcapmdofhmme/1.1/i/theme_frame_overlay_inactive
deleted file mode 100644
index e4d6c17..0000000
--- a/chrome/test/data/profiles/complex_theme/Default/Extensions/mblmlcbknbnfebdfjnolmcapmdofhmme/1.1/i/theme_frame_overlay_inactive
+++ /dev/null
diff --git a/chrome/test/data/profiles/complex_theme/Default/Preferences b/chrome/test/data/profiles/complex_theme/Default/Preferences
deleted file mode 100644
index f3cced4..0000000
--- a/chrome/test/data/profiles/complex_theme/Default/Preferences
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-   "extensions": {
-      "settings": {
-         "mblmlcbknbnfebdfjnolmcapmdofhmme": {
-            "location": 1,
-            "path": "mblmlcbknbnfebdfjnolmcapmdofhmme\\1.1",
-            "state": 1
-         }
-      },
-      "theme": {
-         "colors": {
-            "bookmark_text": [ 0, 0, 0 ],
-            "frame": [ 57, 137, 194 ],
-            "frame_inactive": [ 155, 196, 224 ],
-            "frame_incognito": [ 68, 90, 106 ],
-            "frame_incognito_inactive": [ 118, 156, 183 ],
-            "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": "..\\test\\data\\profiles\\complex_theme\\Default\\Extensions\\mblmlcbknbnfebdfjnolmcapmdofhmme\\1.1\\i\\agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYwsgCDA",
-            "theme_frame": "..\\test\\data\\profiles\\complex_theme\\Default\\Extensions\\mblmlcbknbnfebdfjnolmcapmdofhmme\\1.1\\i\\agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYw8gCDA",
-            "theme_ntp_background": "..\\test\\data\\profiles\\complex_theme\\Default\\Extensions\\mblmlcbknbnfebdfjnolmcapmdofhmme\\1.1\\i\\agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYj9gCDA",
-            "theme_tab_background": "..\\test\\data\\profiles\\complex_theme\\Default\\Extensions\\mblmlcbknbnfebdfjnolmcapmdofhmme\\1.1\\i\\agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUY_c8CDA",
-            "theme_toolbar": "..\\test\\data\\profiles\\complex_theme\\Default\\Extensions\\mblmlcbknbnfebdfjnolmcapmdofhmme\\1.1\\i\\agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYnMgCDA",
-            "theme_window_control_background": "..\\test\\data\\profiles\\complex_theme\\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": {
-      "exited_cleanly": true,
-      "id": "not-signed-in",
-      "name": "Not Signed In",
-      "nickname": "not-signed-in"
-   },
-   "spellcheck": {
-      "dictionary": "en-US"
-   }
-}
diff --git a/chrome/test/data/profiles/complex_theme/Default/PreferencesTemplate b/chrome/test/data/profiles/complex_theme/Default/PreferencesTemplate
index 1f1382a..091c8ce 100644
--- a/chrome/test/data/profiles/complex_theme/Default/PreferencesTemplate
+++ b/chrome/test/data/profiles/complex_theme/Default/PreferencesTemplate
@@ -31,15 +31,13 @@
          "id": "mblmlcbknbnfebdfjnolmcapmdofhmme",
          "images": {
             "theme_button_background": "$1/Default/Extensions/mblmlcbknbnfebdfjnolmcapmdofhmme/1.1/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYwsgCDA",
-            "theme_frame": "$1/Default/Extensions/mblmlcbknbnfebdfjnolmcapmdofhmme/1.1/i/theme_frame",
-            "theme_frame_inactive": "$1/Default/Extensions/mblmlcbknbnfebdfjnolmcapmdofhmme/1.1/i/theme_frame_inactive",
-            "theme_frame_incognito": "$1/Default/Extensions/mblmlcbknbnfebdfjnolmcapmdofhmme/1.1/i/theme_frame_incognito",
-            "theme_frame_incognito_inactive": "$1/Default/Extensions/mblmlcbknbnfebdfjnolmcapmdofhmme/1.1/i/theme_frame_incognito_inactive",
-            "theme_frame_overlay": "$1/Default/Extensions/mblmlcbknbnfebdfjnolmcapmdofhmme/1.1/i/theme_frame_overlay",
-            "theme_frame_overlay_inactive": "$1/Default/Extensions/mblmlcbknbnfebdfjnolmcapmdofhmme/1.1/i/theme_frame_overlay_inactive",
+            "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/Extensions/mblmlcbknbnfebdfjnolmcapmdofhmme/1.1/i/theme_tab_background",
-            "theme_tab_background_incognito": "$1/Default/Extensions/mblmlcbknbnfebdfjnolmcapmdofhmme/1.1/i/theme_tab_background_incognito",
+            "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"
          },