diff options
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/browser_process_impl.cc | 21 | ||||
| -rw-r--r-- | chrome/browser/chrome_content_browser_client.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/component_updater/flash_component_installer.h | 3 | ||||
| -rw-r--r-- | chrome/browser/component_updater/npapi_flash_component_installer.cc | 224 | ||||
| -rw-r--r-- | chrome/browser/component_updater/pepper_flash_component_installer.cc | 3 | ||||
| -rw-r--r-- | chrome/chrome_browser.gypi | 1 | ||||
| -rw-r--r-- | chrome/common/chrome_content_client.cc | 26 | ||||
| -rw-r--r-- | chrome/common/chrome_content_client.h | 13 | ||||
| -rw-r--r-- | chrome/common/chrome_paths.cc | 4 | ||||
| -rw-r--r-- | chrome/common/chrome_paths.h | 9 | ||||
| -rw-r--r-- | chrome/common/chrome_switches.cc | 8 | ||||
| -rw-r--r-- | chrome/common/chrome_switches.h | 2 | ||||
| -rw-r--r-- | chrome/common/pepper_flash.cc | 27 | ||||
| -rw-r--r-- | chrome/common/pepper_flash.h | 6 |
14 files changed, 9 insertions, 340 deletions
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc index 3a72d68..1129bd0 100644 --- a/chrome/browser/browser_process_impl.cc +++ b/chrome/browser/browser_process_impl.cc @@ -64,7 +64,6 @@ #include "chrome/browser/ui/bookmarks/bookmark_prompt_controller.h" #include "chrome/browser/ui/browser_list.h" #include "chrome/common/chrome_constants.h" -#include "chrome/common/chrome_content_client.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" @@ -80,7 +79,6 @@ #include "content/public/browser/plugin_service.h" #include "content/public/browser/render_process_host.h" #include "content/public/browser/resource_dispatcher_host.h" -#include "content/public/common/pepper_plugin_info.h" #include "extensions/common/constants.h" #include "net/socket/client_socket_pool_manager.h" #include "net/url_request/url_request_context_getter.h" @@ -795,25 +793,6 @@ void BrowserProcessImpl::PreMainMessageLoopRun() { plugin_service->SetFilter(ChromePluginServiceFilter::GetInstance()); plugin_service->StartWatchingPlugins(); - // Register the internal Flash if available. - FilePath path; - if (!CommandLine::ForCurrentProcess()->HasSwitch( - switches::kDisableInternalFlash) && - PathService::Get(chrome::FILE_FLASH_PLUGIN_EXISTING, &path)) { - plugin_service->AddExtraPluginPath(path); - } - - // Register bundled Pepper Flash if available. - content::PepperPluginInfo plugin; - bool add_at_beginning = false; - chrome::ChromeContentClient* content_client = - static_cast<chrome::ChromeContentClient*>(content::GetContentClient()); - if (content_client->GetBundledFieldTrialPepperFlash(&plugin, - &add_at_beginning)) { - plugin_service->RegisterInternalPlugin(plugin.ToWebPluginInfo(), - add_at_beginning); - } - #if defined(OS_POSIX) // Also find plugins in a user-specific plugins dir, // e.g. ~/.config/chromium/Plugins. diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc index 3a4140e..b0c01e9 100644 --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc @@ -958,7 +958,6 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches( switches::kDisableScriptedPrintThrottling, switches::kDumpHistogramsOnExit, switches::kEnableBenchmarking, - switches::kEnableBundledPpapiFlash, switches::kEnableCrxlessWebApps, switches::kEnableExperimentalExtensionApis, switches::kEnableIPCFuzzing, @@ -1014,7 +1013,6 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches( switches::kUserDataDir, // Make logs go to the right file. // Load (in-process) Pepper plugins in-process in the zygote pre-sandbox. switches::kDisableBundledPpapiFlash, - switches::kEnableBundledPpapiFlash, switches::kPpapiFlashInProcess, switches::kPpapiFlashPath, switches::kPpapiFlashVersion, diff --git a/chrome/browser/component_updater/flash_component_installer.h b/chrome/browser/component_updater/flash_component_installer.h index 62e5418..45fe22f 100644 --- a/chrome/browser/component_updater/flash_component_installer.h +++ b/chrome/browser/component_updater/flash_component_installer.h @@ -12,9 +12,6 @@ namespace base { class DictionaryValue; } -// Component update registration for built-in flash player (non-Pepper). -void RegisterNPAPIFlashComponent(ComponentUpdateService* cus); - // Our job is to 1) find what Pepper flash is installed (if any) and 2) register // with the component updater to download the latest version when available. // The first part is IO intensive so we do it asynchronously in the file thread. diff --git a/chrome/browser/component_updater/npapi_flash_component_installer.cc b/chrome/browser/component_updater/npapi_flash_component_installer.cc deleted file mode 100644 index d078380..0000000 --- a/chrome/browser/component_updater/npapi_flash_component_installer.cc +++ /dev/null @@ -1,224 +0,0 @@ -// Copyright (c) 2012 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/component_updater/flash_component_installer.h" - -#include <algorithm> - -#include "base/base_paths.h" -#include "base/bind.h" -#include "base/compiler_specific.h" -#include "base/file_path.h" -#include "base/file_util.h" -#include "base/logging.h" -#include "base/path_service.h" -#include "base/string_util.h" -#include "base/values.h" -#include "chrome/browser/component_updater/component_updater_service.h" -#include "chrome/browser/plugins/plugin_prefs.h" -#include "chrome/common/chrome_paths.h" -#include "content/public/browser/browser_thread.h" -#include "content/public/browser/plugin_service.h" -#include "webkit/plugins/webplugininfo.h" - -using content::BrowserThread; -using content::PluginService; - -namespace { - -// CRX hash. The extension id is: immdilkhigodmjbnngapbehchmihabbg. -const uint8 sha2_hash[] = {0x8c, 0xc3, 0x8b, 0xa7, 0x86, 0xe3, 0xc9, 0x1d, - 0xd6, 0x0f, 0x14, 0x72, 0x7c, 0x87, 0x01, 0x16, - 0xe2, 0x00, 0x6c, 0x98, 0xbc, 0xfb, 0x14, 0x1b, - 0x5c, 0xcd, 0xff, 0x3d, 0xa3, 0x2e, 0x2c, 0x49}; - -// File name of the internal Flash plugin on different platforms. -const FilePath::CharType kFlashPluginFileName[] = -#if defined(OS_MACOSX) - FILE_PATH_LITERAL("Flash Player Plugin for Chrome.plugin"); -#elif defined(OS_WIN) - FILE_PATH_LITERAL("gcswf32.dll"); -#else // OS_LINUX, etc. - FILE_PATH_LITERAL("libgcflashplayer.so"); -#endif - -const char kNPAPIFlashManifestName[] = "NPAPIFlash"; - -// The NPAPI flash plugins are in a directory with this name. -const FilePath::CharType kNPAPIFlashBaseDirectory[] = - FILE_PATH_LITERAL("NPAPIFlash"); - -// The base directory on windows looks like: -// <profile>\AppData\Local\Google\Chrome\User Data\NPAPIFlash\. -FilePath GetNPAPIFlashBaseDirectory() { - FilePath result; - PathService::Get(chrome::DIR_USER_DATA, &result); - return result.Append(kNPAPIFlashBaseDirectory); -} - -std::string NormalizeVersion(const string16& version) { - std::string ascii_ver = UTF16ToASCII(version); - std::replace(ascii_ver.begin(), ascii_ver.end(), ',', '.'); - return ascii_ver; -} - -} // namespace - -class NPAPIFlashComponentInstaller : public ComponentInstaller { - public: - explicit NPAPIFlashComponentInstaller(const Version& version); - - virtual ~NPAPIFlashComponentInstaller() {} - - virtual void OnUpdateError(int error) OVERRIDE; - - virtual bool Install(base::DictionaryValue* manifest, - const FilePath& unpack_path) OVERRIDE; - - private: - Version current_version_; -}; - -NPAPIFlashComponentInstaller::NPAPIFlashComponentInstaller( - const Version& version) : current_version_(version) { - DCHECK(version.IsValid()); -} - -void NPAPIFlashComponentInstaller::OnUpdateError(int error) { - NOTREACHED() << "NPAPI flash update error: " << error; -} - -bool NPAPIFlashComponentInstaller::Install(base::DictionaryValue* manifest, - const FilePath& unpack_path) { - std::string name; - manifest->GetStringASCII("name", &name); - if (name != kNPAPIFlashManifestName) - return false; - std::string proposed_version; - manifest->GetStringASCII("version", &proposed_version); - Version version(proposed_version.c_str()); - if (!version.IsValid()) - return false; - if (current_version_.CompareTo(version) >= 0) - return false; - if (!file_util::PathExists(unpack_path.Append(kFlashPluginFileName))) - return false; - // Passed the basic tests. Time to install it. - if (!file_util::Move(unpack_path, GetNPAPIFlashBaseDirectory())) - return false; - // Installation is done. Now tell the rest of chrome. - current_version_ = version; - PluginService::GetInstance()->RefreshPlugins(); - return true; -} - -void FinishFlashUpdateRegistration(ComponentUpdateService* cus, - const webkit::WebPluginInfo& info) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); - - // todo(cpu): Add PluginPrefs code here to determine if what we update - // is actually going to be used. - - Version version(NormalizeVersion(info.version)); - if (!version.IsValid()) { - NOTREACHED(); - return; - } - - CrxComponent flash; - flash.name = "npapi_flash"; - flash.installer = new NPAPIFlashComponentInstaller(version); - flash.version = version; - flash.pk_hash.assign(sha2_hash, &sha2_hash[sizeof(sha2_hash)]); - if (cus->RegisterComponent(flash) != ComponentUpdateService::kOk) { - NOTREACHED() << "Flash component registration fail"; - } -} - -// The code in this function is only concerned about learning what flash plugin -// chrome is using and what is its version. This will determine if we register -// for component update or not. Read the comments on RegisterNPAPIFlashComponent -// for more background. -void StartFlashUpdateRegistration(ComponentUpdateService* cus, - const std::vector<webkit::WebPluginInfo>&) { - FilePath builtin_plugin_path; - if (!PathService::Get(chrome::FILE_FLASH_PLUGIN_EXISTING, - &builtin_plugin_path)) - return; - - FilePath updated_plugin_path = - GetNPAPIFlashBaseDirectory().Append(kFlashPluginFileName); - - PluginService* plugins = PluginService::GetInstance(); - webkit::WebPluginInfo plugin_info; - - if (plugins->GetPluginInfoByPath(updated_plugin_path, &plugin_info)) { - // The updated plugin is newer. Since flash is used by pretty much every - // webpage out there, odds are it is going to be loaded, which means - // receiving an update is pointless since we can't swap them. You might - // find this pessimistic. The way we get out of this situation is when - // we update the whole product. - DLOG(INFO) << "updated plugin overriding built-in flash"; - return; - } else if (plugins->GetPluginInfoByPath(builtin_plugin_path, &plugin_info)) { - // The built plugin is newer. Delete the updated plugin and register for - // updates. This should be the normal case. - file_util::Delete(GetNPAPIFlashBaseDirectory(), true); - } else { - // Strange installation. Log and abort registration. - DLOG(WARNING) << "Strange flash npapi configuration"; - return; - } - - BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, - base::Bind(&FinishFlashUpdateRegistration, cus, plugin_info)); -} - -// Here is the general plan of action: we are going to update flash and we have -// the following cases: -// 1- The active flash is not the built-in flash (user override). -// 2- The active flash is the built-in flash. -// 3- The active flash is the one from the component updater. -// In case 1 we do nothing. In cases 2 and 3 we need to compare versions -// and if the higher version is: -// case 2: remove the component update flash, register with component updater. -// case 3: register with component updater. -// -// In practice, it's complicated. First off, to learn the version of the plugin -// we have to do file IO, which PluginList will do for us but we have to be -// careful not to trigger this on the UI thread: AddExtraPluginPath and -// RefreshPlugins don't trigger file IO, but most of the others calls do. -// -// Secondly, we can do this in a delayed task. Right now we just need to -// register the right plugin before chrome loads the first flash-ladden page. -// -// Interestingly, if PluginList finds two plugins with the same filename and -// same mimetypes, it will only keep the one with the higher version. This is -// our case in the sense that a component updated flash is very much the same -// thing as built-in flash: sometimes newer or sometimes older. That is why -// you don't see version comparison in this code. -// -// So to kick off the magic we add the updated flash path here, even though -// there might not be a flash player in that location. If there is and it is -// newer, it will take its place then we fire StartFlashUpdateRegistration -// on the IO thread to learn which one won. Since we do it in a delayed task -// probably somebody (unknowingly) will pay for the file IO, so usually get -// the information for free. -void RegisterNPAPIFlashComponent(ComponentUpdateService* cus) { -#if !defined(OS_CHROMEOS) - FilePath path = GetNPAPIFlashBaseDirectory().Append(kFlashPluginFileName); - PluginService::GetInstance()->AddExtraPluginPath(path); - PluginService::GetInstance()->RefreshPlugins(); - - // Post the task to the FILE thread because IO may be done once the plugins - // are loaded. - BrowserThread::PostDelayedTask( - BrowserThread::FILE, - FROM_HERE, - base::Bind(&PluginService::GetPlugins, - base::Unretained(PluginService::GetInstance()), - base::Bind(&StartFlashUpdateRegistration, cus)), - base::TimeDelta::FromSeconds(8)); -#endif -} diff --git a/chrome/browser/component_updater/pepper_flash_component_installer.cc b/chrome/browser/component_updater/pepper_flash_component_installer.cc index 24f6113b..76ee1af 100644 --- a/chrome/browser/component_updater/pepper_flash_component_installer.cc +++ b/chrome/browser/component_updater/pepper_flash_component_installer.cc @@ -196,9 +196,8 @@ void RegisterPepperFlashWithChrome(const FilePath& path, break; } - bool add_to_front = IsPepperFlashEnabledByDefault(); PluginService::GetInstance()->RegisterInternalPlugin( - plugin_info.ToWebPluginInfo(), add_to_front); + plugin_info.ToWebPluginInfo(), true); PluginService::GetInstance()->RefreshPlugins(); } diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index 6e3b5a1..bcf30f8 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -459,7 +459,6 @@ 'browser/component_updater/component_updater_service.cc', 'browser/component_updater/component_updater_service.h', 'browser/component_updater/flash_component_installer.h', - 'browser/component_updater/npapi_flash_component_installer.cc', 'browser/component_updater/pepper_flash_component_installer.cc', 'browser/component_updater/pnacl/pnacl_component_installer.cc', 'browser/component_updater/pnacl/pnacl_component_installer.h', diff --git a/chrome/common/chrome_content_client.cc b/chrome/common/chrome_content_client.cc index 9ad32fd..8e08d5d 100644 --- a/chrome/common/chrome_content_client.cc +++ b/chrome/common/chrome_content_client.cc @@ -312,8 +312,7 @@ void AddPepperFlashFromCommandLine( CreatePepperFlashInfo(FilePath(flash_path), flash_version)); } -bool GetBundledPepperFlash(content::PepperPluginInfo* plugin, - bool* override_npapi_flash) { +bool GetBundledPepperFlash(content::PepperPluginInfo* plugin) { CommandLine* command_line = CommandLine::ForCurrentProcess(); if (!command_line->HasSwitch(switches::kDisablePepperThreading) && !command_line->HasSwitch(switches::kEnablePepperThreading)) { @@ -343,11 +342,7 @@ bool GetBundledPepperFlash(content::PepperPluginInfo* plugin, if (!PathService::Get(chrome::FILE_PEPPER_FLASH_PLUGIN, &flash_path)) return false; - bool force_enable = - command_line->HasSwitch(switches::kEnableBundledPpapiFlash); - *plugin = CreatePepperFlashInfo(flash_path, FLAPPER_VERSION_STRING); - *override_npapi_flash = force_enable || IsPepperFlashEnabledByDefault(); return true; #else return false; @@ -376,14 +371,9 @@ void ChromeContentClient::AddPepperPlugins( ComputeBuiltInPlugins(plugins); AddPepperFlashFromCommandLine(plugins); - // Don't try to register Pepper Flash if there exists a Pepper Flash field - // trial. It will be registered separately. - if (!ConductingPepperFlashFieldTrial() && IsPepperFlashEnabledByDefault()) { - content::PepperPluginInfo plugin; - bool add_at_beginning = false; - if (GetBundledPepperFlash(&plugin, &add_at_beginning)) - plugins->push_back(plugin); - } + content::PepperPluginInfo plugin; + if (GetBundledPepperFlash(&plugin)) + plugins->push_back(plugin); } void ChromeContentClient::AddNPAPIPlugins( @@ -471,12 +461,4 @@ std::string ChromeContentClient::GetCarbonInterposePath() const { } #endif -bool ChromeContentClient::GetBundledFieldTrialPepperFlash( - content::PepperPluginInfo* plugin, - bool* override_npapi_flash) { - if (!ConductingPepperFlashFieldTrial()) - return false; - return GetBundledPepperFlash(plugin, override_npapi_flash); -} - } // namespace chrome diff --git a/chrome/common/chrome_content_client.h b/chrome/common/chrome_content_client.h index a3b43f3..de0b960 100644 --- a/chrome/common/chrome_content_client.h +++ b/chrome/common/chrome_content_client.h @@ -44,19 +44,6 @@ class ChromeContentClient : public content::ContentClient { int* sandbox_profile_resource_id) const OVERRIDE; virtual std::string GetCarbonInterposePath() const OVERRIDE; #endif - - // Gets information about the bundled Pepper Flash for field trial. - // |override_npapi_flash| indicates whether it should take precedence over - // the internal NPAPI Flash. - // Returns false if bundled Pepper Flash is not available. In that case, - // |plugin| and |override_npapi_flash| are not touched. - // - // TODO(yzshen): We need this method because currently we are having a field - // trial with bundled Pepper Flash, and need extra information about how to - // order bundled Pepper Flash and internal NPAPI Flash. Once the field trial - // is over, we should merge this into AddPepperPlugins(). - bool GetBundledFieldTrialPepperFlash(content::PepperPluginInfo* plugin, - bool* override_npapi_flash); }; } // namespace chrome diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc index 7fec1fa..a34cf87 100644 --- a/chrome/common/chrome_paths.cc +++ b/chrome/common/chrome_paths.cc @@ -277,13 +277,9 @@ bool PathProvider(int key, FilePath* result) { cur = cur.Append(FILE_PATH_LITERAL("script.log")); break; case chrome::FILE_FLASH_PLUGIN: - case chrome::FILE_FLASH_PLUGIN_EXISTING: if (!GetInternalPluginsDirectory(&cur)) return false; cur = cur.Append(kInternalFlashPluginFileName); - if (key == chrome::FILE_FLASH_PLUGIN_EXISTING && - !file_util::PathExists(cur)) - return false; break; case chrome::FILE_PEPPER_FLASH_PLUGIN: if (!PathService::Get(chrome::DIR_PEPPER_FLASH_PLUGIN, &cur)) diff --git a/chrome/common/chrome_paths.h b/chrome/common/chrome_paths.h index f0bdd72..58a32c0 100644 --- a/chrome/common/chrome_paths.h +++ b/chrome/common/chrome_paths.h @@ -72,12 +72,9 @@ enum { FILE_RECORDED_SCRIPT, // Full path to the script.log file that // contains recorded browser events for // playback. - FILE_FLASH_PLUGIN, // Full path to the internal Flash plugin file. - // Querying this path will succeed no matter the - // file exists or not. - FILE_FLASH_PLUGIN_EXISTING, // Full path to the internal Flash plugin file. - // Querying this path will fail if the file - // doesn't exist. + FILE_FLASH_PLUGIN, // Full path to the internal NPAPI Flash plugin + // file. Querying this path will succeed no + // matter the file exists or not. FILE_PEPPER_FLASH_PLUGIN, // Full path to the bundled Pepper Flash plugin // file. FILE_PDF_PLUGIN, // Full path to the internal PDF plugin file. diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc index 2f63435..0024aef 100644 --- a/chrome/common/chrome_switches.cc +++ b/chrome/common/chrome_switches.cc @@ -270,7 +270,7 @@ const char kDisableBackgroundMode[] = "disable-background-mode"; // measurements. const char kDisableBackgroundNetworking[] = "disable-background-networking"; -// Disables the bundled PPAPI version of Flash (if it's enabled by default). +// Disables the bundled PPAPI version of Flash. const char kDisableBundledPpapiFlash[] = "disable-bundled-ppapi-flash"; // Disables the bookmark autocomplete provider (BookmarkProvider). @@ -324,9 +324,6 @@ const char kDisableExtensionsResourceWhitelist[] = const char kDisableImprovedDownloadProtection[] = "disable-improved-download-protection"; -// Disable the internal Flash Player. -const char kDisableInternalFlash[] = "disable-internal-flash"; - // Don't resolve hostnames to IPv6 addresses. This can be used when debugging // issues relating to IPv6, but shouldn't otherwise be needed. Be sure to file // bugs if something isn't working properly in the presence of IPv6. This flag @@ -472,9 +469,6 @@ const char kEnableAutologin[] = "enable-autologin"; // Enables the benchmarking extensions. const char kEnableBenchmarking[] = "enable-benchmarking"; -// Enables the bundled PPAPI version of Flash. -const char kEnableBundledPpapiFlash[] = "enable-bundled-ppapi-flash"; - // This applies only when the process type is "service". Enables the Cloud // Print Proxy component within the service process. const char kEnableCloudPrintProxy[] = "enable-cloud-print-proxy"; diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h index 13844f6..8207995 100644 --- a/chrome/common/chrome_switches.h +++ b/chrome/common/chrome_switches.h @@ -96,7 +96,6 @@ extern const char kDisableExtensionsHttpThrottling[]; extern const char kDisableExtensionsResourceWhitelist[]; extern const char kDisableExtensions[]; extern const char kDisableImprovedDownloadProtection[]; -extern const char kDisableInternalFlash[]; extern const char kDisableIPv6[]; extern const char kDisableIPPooling[]; extern const char kDisableNTPOtherSessionsMenu[]; @@ -138,7 +137,6 @@ extern const char kEnableAsyncDns[]; extern const char kEnableAuthNegotiatePort[]; extern const char kEnableAutologin[]; extern const char kEnableBenchmarking[]; -extern const char kEnableBundledPpapiFlash[]; extern const char kEnableCloudPrintProxy[]; extern const char kEnableContacts[]; extern const char kEnableCrxlessWebApps[]; diff --git a/chrome/common/pepper_flash.cc b/chrome/common/pepper_flash.cc index d443625..519250f 100644 --- a/chrome/common/pepper_flash.cc +++ b/chrome/common/pepper_flash.cc @@ -6,35 +6,8 @@ #include "ppapi/shared_impl/ppapi_permissions.h" -bool ConductingPepperFlashFieldTrial() { -#if defined(OS_WIN) - return true; -#elif defined(OS_MACOSX) - return true; -#else - return false; -#endif -} - -bool IsPepperFlashEnabledByDefault() { -#if defined(USE_AURA) - // Pepper Flash is required for Aura (on any OS). - return true; -#elif defined(OS_WIN) - return true; -#elif defined(OS_LINUX) - // For Linux, always try to use it (availability is checked elsewhere). - return true; -#elif defined(OS_MACOSX) - return true; -#else - return false; -#endif -} - int32 kPepperFlashPermissions = ppapi::PERMISSION_DEV | ppapi::PERMISSION_PRIVATE | ppapi::PERMISSION_BYPASS_USER_GESTURE | ppapi::PERMISSION_FLASH; - diff --git a/chrome/common/pepper_flash.h b/chrome/common/pepper_flash.h index e73a198..80143af 100644 --- a/chrome/common/pepper_flash.h +++ b/chrome/common/pepper_flash.h @@ -7,12 +7,6 @@ #include "base/basictypes.h" -// Whether a field trial for Pepper Flash is going on. -bool ConductingPepperFlashFieldTrial(); - -// True if Pepper Flash should be enabled by default. -bool IsPepperFlashEnabledByDefault(); - // Permission bits for Pepper Flash. extern int32 kPepperFlashPermissions; |