More pre-MD odds and ends.

chrome/browser/themes/theme_service_browsertest.cc

Index: chrome/browser/themes/theme_service_browsertest.cc
diff --git a/chrome/browser/themes/theme_service_browsertest.cc b/chrome/browser/themes/theme_service_browsertest.cc
index 8980e9f01bcefbd8d15387715807c6508dfd30e6..f630980340ca6a2122502bc3747c7811ef163d8c 100644
--- a/chrome/browser/themes/theme_service_browsertest.cc
+++ b/chrome/browser/themes/theme_service_browsertest.cc
@@ -64,6 +64,14 @@ IN_PROC_BROWSER_TEST_F(ThemeServiceBrowserTest, PRE_ThemeDataPackInvalid) {
             theme_provider.GetColor(ThemeProperties::COLOR_TOOLBAR));
   EXPECT_NE(base::FilePath(),
             profile->GetPrefs()->GetFilePath(prefs::kCurrentThemePackFilename));
+  // Add a vestigial .pak file that should be removed when the new one is
+  // created.
+  // TODO(estade): remove when vestigial .pak file deletion is removed.
+  EXPECT_EQ(1,
+            base::WriteFile(profile->GetPrefs()
+                                ->GetFilePath(prefs::kCurrentThemePackFilename)
+                                .Append("Cached Theme Material Design.pak"),
+                            "a", 1));
 
   // Change the theme data pack path to an invalid location such that second
   // part of the test is forced to recreate the theme pack when the theme
@@ -81,6 +89,16 @@ IN_PROC_BROWSER_TEST_F(ThemeServiceBrowserTest, ThemeDataPackInvalid) {
   EXPECT_TRUE(UsingCustomTheme(*theme_service));
   EXPECT_EQ(kThemeToolbarColor,
             theme_provider.GetColor(ThemeProperties::COLOR_TOOLBAR));
+
+  // TODO(estade): remove when vestigial .pak file deletion is removed.
+  content::BrowserThread::GetBlockingPool()->FlushForTesting();
+  base::FilePath old_path = browser()
+                                ->profile()
+                                ->GetPrefs()
+                                ->GetFilePath(prefs::kCurrentThemePackFilename)
+                                .Append("Cached Theme Material Design.pak");
+  EXPECT_FALSE(base::PathExists(old_path)) << "File not deleted: "
+                                           << old_path.value();
 }
 
 }  // namespace