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

chrome/browser/extensions/component_loader.cc

 // 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/extensions/component_loader.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/files/file_util.h"
@@ skipping 40 matching lines @@
 #include "content/public/browser/site_instance.h"
 #include "content/public/browser/storage_partition.h"
 #include "extensions/browser/extensions_browser_client.h"
 #include "storage/browser/fileapi/file_system_context.h"
 #endif
 
 #if defined(ENABLE_APP_LIST)
 #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 {
 
 namespace {
 
 static bool enable_background_extensions_during_testing = false;
 
 std::string GenerateId(const base::DictionaryValue* manifest,
                        const base::FilePath& path) {
@@ skipping 536 matching lines @@
 
   bool enabled_via_field_trial =
       field_trial_result.compare(0, enable_prefix.length(), enable_prefix) == 0;
 
   // Enable the feature on trybots and trunk builds.
   bool enabled_via_trunk_build =
       chrome::VersionInfo::GetChannel() == chrome::VersionInfo::CHANNEL_UNKNOWN;
 
   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")));
   }
 #endif
 
 #if defined(GOOGLE_CHROME_BUILD)
 #if !defined(OS_CHROMEOS)  // http://crbug.com/314799
   AddNetworkSpeechSynthesisExtension();
 #endif
@@ skipping 35 matching lines @@
         off_the_record_context, Extension::GetBaseURLFromExtensionId(id));
     storage::FileSystemContext* file_system_context =
         content::BrowserContext::GetStoragePartitionForSite(
             off_the_record_context, site)->GetFileSystemContext();
     file_system_context->EnableTemporaryFileSystemInIncognito();
   }
 #endif
 }
 
 }  // namespace extensions