Disable notifications extension in component loader if launcher field trial is running (ChromeOS on…

chrome/browser/extensions/component_loader.cc

Index: chrome/browser/extensions/component_loader.cc
diff --git a/chrome/browser/extensions/component_loader.cc b/chrome/browser/extensions/component_loader.cc
index d337a6ab2067d8321a7c2015d8e5cda2aeb018db..1d5a351258af34df0e04f4a6171ca5d623c16eaa 100644
--- a/chrome/browser/extensions/component_loader.cc
+++ b/chrome/browser/extensions/component_loader.cc
@@ -58,6 +58,10 @@
 #include "chrome/grit/chromium_strings.h"
 #endif
 
+#if defined(ENABLE_APP_LIST) && defined(OS_CHROMEOS)
+#include "chrome/browser/ui/app_list/google_now_extension.h"
+#endif
+
 using content::BrowserThread;
 
 namespace extensions {
@@ -614,6 +618,14 @@ void ComponentLoader::AddDefaultComponentExtensionsWithBackgroundPages(
 
   bool enabled = enabled_via_field_trial || enabled_via_trunk_build;
 
+#if defined(ENABLE_APP_LIST) && defined(OS_CHROMEOS)
+  // Don't load if newer trial is running (== new extension id is available).
+  std::string google_now_extension_id;

[robliao, 2015/02/19 06:06:53]

OPTIONAL: Could rename to ignored_extension_id.

[skare_, 2015/02/19 15:20:28]

Done.

+  if (GetGoogleNowExtensionId(&google_now_extension_id)) {
+    enabled = false;
+  }
+#endif
+
   if (!skip_session_components && enabled) {
     Add(IDR_GOOGLE_NOW_MANIFEST,
         base::FilePath(FILE_PATH_LITERAL("google_now")));