Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(137)

Unified Diff: chrome/common/chrome_content_client.cc

Issue 2567773002: Revert "Add flags entries to test chrome OS component updates in release mode." (Closed)
Patch Set: Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/common/chrome_content_client.cc
diff --git a/chrome/common/chrome_content_client.cc b/chrome/common/chrome_content_client.cc
index f8eeda9e79bbf16e05f88a5d692304600cee5267..20ba8876bd79e7d9d3672156011d40499d53f9f0 100644
--- a/chrome/common/chrome_content_client.cc
+++ b/chrome/common/chrome_content_client.cc
@@ -26,7 +26,6 @@
#include "build/build_config.h"
#include "chrome/common/child_process_logging.h"
#include "chrome/common/chrome_constants.h"
-#include "chrome/common/chrome_features.h"
#include "chrome/common/chrome_paths.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/crash_keys.h"
@@ -273,13 +272,6 @@ content::PepperPluginInfo CreatePepperFlashInfo(const base::FilePath& path,
}
bool GetCommandLinePepperFlash(content::PepperPluginInfo* plugin) {
-#if defined(OS_CHROMEOS)
- // On Chrome OS, we cannot test component flash updates reliably unless we
- // guarantee that the component updated flash plugin will be used.
- if (base::FeatureList::IsEnabled(features::kComponentFlashOnly))
- return false;
-#endif // defined(OS_CHROMEOS)
-
const base::CommandLine::StringType flash_path =
base::CommandLine::ForCurrentProcess()->GetSwitchValueNative(
switches::kPpapiFlashPath);
« no previous file with comments | « chrome/browser/component_updater/pepper_flash_component_installer.cc ('k') | chrome/common/chrome_features.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698