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 83ec093d0a217ca31cc72349527a539e249b2c1c..0d431c2a45da8e4b3bca9f8fbb70a23535db8a70 100644
--- a/chrome/browser/extensions/component_loader.cc
+++ b/chrome/browser/extensions/component_loader.cc
@@ -59,6 +59,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 {
@@ -615,6 +619,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 ignored_extension_id;
+  if (GetGoogleNowExtensionId(&ignored_extension_id)) {
+    enabled = false;
+  }
+#endif
+
   if (!skip_session_components && enabled) {
     Add(IDR_GOOGLE_NOW_MANIFEST,
         base::FilePath(FILE_PATH_LITERAL("google_now")));