More pre-MD odds and ends.

chrome/browser/extensions/extension_service_unittest.cc

Index: chrome/browser/extensions/extension_service_unittest.cc
diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc
index e146ead682286b435300ebecc374e154c9ec6d76..d7e8ad2a17686f20c738f9d1f3c4af88d91b4b50 100644
--- a/chrome/browser/extensions/extension_service_unittest.cc
+++ b/chrome/browser/extensions/extension_service_unittest.cc
@@ -139,7 +139,6 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/base/material_design/material_design_controller.h"
 #include "url/gurl.h"
 
 #if defined(OS_CHROMEOS)
@@ -2135,14 +2134,10 @@ TEST_F(ExtensionServiceTest, LoadLocalizedTheme) {
   EXPECT_EQ("name", theme->name());
   EXPECT_EQ("description", theme->description());
 
-  // Cleanup the "Cached Theme.pak" file (or "Cached Theme Material Design.pak"
-  // when Material Design is enabled). Ideally, this would be installed in a
+  // Cleanup the "Cached Theme.pak" file. Ideally, this would be installed in a
   // temporary directory, but it automatically installs to the extension's
   // directory, and we don't want to copy the whole extension for a unittest.
-  base::FilePath theme_file = extension_path.Append(
-      ui::MaterialDesignController::IsModeMaterial()
-           ? chrome::kThemePackMaterialDesignFilename

[Peter Kasting, 2016/10/26 03:28:46]

Do we need some kind of cleanup pass to avoid leaving the old .pak file lying
around forever?  E.g. Add something to the code that just checks for and deletes
the old file name unconditionally, leave it in for a while, take it out someday.

[Evan Stade, 2016/11/02 00:41:13]

I suppose that would be good. .pak files are a few MB. They would be deleted any
time you install a new theme, but people might not do that often. I added a pass
that removes the Material .pak when re-generating a .pak (which should happen
for everyone since I bumped the theme version number). Also added a test.

-           : chrome::kThemePackFilename);
+  base::FilePath theme_file = extension_path.Append(chrome::kThemePackFilename);
   ASSERT_TRUE(base::PathExists(theme_file));
   ASSERT_TRUE(base::DeleteFile(theme_file, false));  // Not recursive.
 }