Revert 49739 - Reenable InstallApps.

Don't cache the value of the CommandLine, since unit_tests can modify it while
the process is running.

BUG=41280

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

TBR=mpcomplete@chromium.org
Review URL: http://codereview.chromium.org/2861001

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

2 files changed, 6 insertions, 2 deletions

diff --git a/chrome/browser/extensions/extensions_service_unittest.cc b/chrome/browser/extensions/extensions_service_unittest.cc
index e060b40..a819ef8 100644
--- a/chrome/browser/extensions/extensions_service_unittest.cc
+++ b/chrome/browser/extensions/extensions_service_unittest.cc
@@ -962,7 +962,9 @@ TEST_F(ExtensionsServiceTest, InstallTheme) {
   ValidatePrefKeyCount(pref_count);
 }
 
-TEST_F(ExtensionsServiceTest, InstallApps) {
+// TODO(mpcomplete): temporarily disabled while I fix the test on linux.
+// http://code.google.com/p/chromium/issues/detail?id=41280
+TEST_F(ExtensionsServiceTest, DISABLED_InstallApps) {
   InitializeEmptyExtensionsService();
   FilePath extensions_path;
   ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &extensions_path));
diff --git a/chrome/common/extensions/extension.cc b/chrome/common/extensions/extension.cc
index 4a6bac3..8736c79 100644
--- a/chrome/common/extensions/extension.cc
+++ b/chrome/common/extensions/extension.cc
@@ -934,7 +934,9 @@ bool Extension::AppsAreEnabled() {
 #if defined(OS_CHROMEOS)
   return true;
 #else
-  return CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableApps);
+  static bool apps_enabled_mode =
+      CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableApps);
+  return apps_enabled_mode;
 #endif
 }