Index: chrome/browser/plugins/plugin_prefs_unittest.cc |
diff --git a/chrome/browser/plugins/plugin_prefs_unittest.cc b/chrome/browser/plugins/plugin_prefs_unittest.cc |
index 397eef54df483980642ddf3641e503db60443f05..7f86194cfcdae9171e73093d4499bcd8523b8d10 100644 |
--- a/chrome/browser/plugins/plugin_prefs_unittest.cc |
+++ b/chrome/browser/plugins/plugin_prefs_unittest.cc |
@@ -31,6 +31,7 @@ void CanEnablePluginCallback(const base::Closure& quit_closure, |
quit_closure.Run(); |
} |
+#if !(defined(OS_LINUX) && defined(USE_AURA)) |
base::FilePath GetComponentUpdatedPepperFlashPath( |
const base::FilePath::StringType& version) { |
base::FilePath path; |
@@ -46,6 +47,7 @@ base::FilePath GetBundledPepperFlashPath() { |
EXPECT_TRUE(PathService::Get(chrome::FILE_PEPPER_FLASH_PLUGIN, &path)); |
return path; |
} |
+#endif |
Nico
2013/11/10 05:07:09
// !(defined(OS_LINUX) && defined(USE_AURA))
hans
2013/11/11 19:29:51
Done.
|
void GotPlugins(const base::Closure& quit_closure, |
const std::vector<content::WebPluginInfo>& plugins) { |