Make disabled internal plugins stay disabled even when the version of Chrome changes.

This change is a bit hacky, but the proper change is to re-factor the plugins
stuff (and such a change wouldn't be M5-able).

BUG=42393
TEST=On Chrome with this CL, disable internal Flash. Update Chrome to a newer version (also with this CL). Check that internal Flash remains disabled. (Or hack the prefs file to test manually....)

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

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

4 files changed, 11 insertions, 0 deletions

diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc
index aefcebc..6a6c232 100644
--- a/chrome/common/chrome_paths.cc
+++ b/chrome/common/chrome_paths.cc
@@ -192,6 +192,10 @@ bool PathProvider(int key, FilePath* result) {
       cur = cur.Append(FILE_PATH_LITERAL("Temp"));
       create_dir = true;
       break;
+    case chrome::DIR_INTERNAL_PLUGINS:
+      if (!GetInternalPluginsDirectory(&cur))
+        return false;
+      break;
     case chrome::FILE_LOCAL_STATE:
       if (!PathService::Get(chrome::DIR_USER_DATA, &cur))
         return false;
diff --git a/chrome/common/chrome_paths.h b/chrome/common/chrome_paths.h
index 9ed8057..482e5da 100644
--- a/chrome/common/chrome_paths.h
+++ b/chrome/common/chrome_paths.h
@@ -36,6 +36,7 @@ enum {
                                 // this when a temporary file or directory will
                                 // be moved into the profile, to avoid issues
                                 // moving across volumes.  See crbug.com/13044 .
+  DIR_INTERNAL_PLUGINS,         // Directory where internal plugins reside.
   FILE_RESOURCE_MODULE,         // Full path and filename of the module that
                                 // contains embedded resources (version,
                                 // strings, images, etc.).
diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
index 40bd9f4..3f40b8f 100644
--- a/chrome/common/pref_names.cc
+++ b/chrome/common/pref_names.cc
@@ -326,6 +326,11 @@ const wchar_t kExtensionsUIDeveloperMode[] = L"extensions.ui.developer_mode";
 // actions toolbar.
 const wchar_t kExtensionToolbarSize[] = L"extensions.toolbarsize";
 
+// Pref containing the directory for internal plugins as written to the plugins
+// list (below).
+const wchar_t kPluginsLastInternalDirectory[] =
+    L"plugins.last_internal_directory";
+
 // List pref containing information (dictionaries) on plugins.
 const wchar_t kPluginsPluginsList[] = L"plugins.plugins_list";
 
diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
index 6a22114..b9d4161 100644
--- a/chrome/common/pref_names.h
+++ b/chrome/common/pref_names.h
@@ -130,6 +130,7 @@ extern const wchar_t kCurrentThemeTints[];
 extern const wchar_t kCurrentThemeDisplayProperties[];
 extern const wchar_t kExtensionsUIDeveloperMode[];
 extern const wchar_t kExtensionToolbarSize[];
+extern const wchar_t kPluginsLastInternalDirectory[];
 extern const wchar_t kPluginsPluginsList[];
 extern const wchar_t kCheckDefaultBrowser[];
 #if defined(OS_MACOSX)