More pre-MD odds and ends.

chrome/browser/themes/theme_service_browsertest.cc

 // Copyright (c) 2013 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/themes/theme_service.h"
 
 #include "base/macros.h"
 #include "chrome/browser/extensions/component_loader.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 46 matching lines @@
             profile->GetPrefs()->GetFilePath(prefs::kCurrentThemePackFilename));
 
   InstallExtension(test_data_dir_.AppendASCII("theme"), 1);
 
   // Check that the theme was installed.
   EXPECT_TRUE(UsingCustomTheme(*theme_service));
   EXPECT_EQ(kThemeToolbarColor,
             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)
+                             .AppendASCII("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
   // service is initialized.
   profile->GetPrefs()->SetFilePath(
       prefs::kCurrentThemePackFilename,
       base::FilePath());
 }
 
 IN_PROC_BROWSER_TEST_F(ThemeServiceBrowserTest, ThemeDataPackInvalid) {
   ThemeService* theme_service = ThemeServiceFactory::GetForProfile(
       browser()->profile());
   const ui::ThemeProvider& theme_provider =
       ThemeService::GetThemeProviderForProfile(browser()->profile());
   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)
+          .AppendASCII("Cached Theme Material Design.pak");
+  EXPECT_FALSE(base::PathExists(old_path)) << "File not deleted: "
+                                           << old_path.value();
 }
 
 }  // namespace