Force Enhanced Bookmark to be enabled if command line flags are set true

chrome/browser/extensions/external_component_loader.cc

 // Copyright (c) 2013 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/external_component_loader.h"
 
 #include "base/strings/string_number_conversions.h"
 #include "chrome/browser/bookmarks/enhanced_bookmarks_features.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/search/hotword_service.h"
@@ skipping 49 matching lines @@
     std::string hotword_id = extension_misc::kHotwordExtensionId;
     if (HotwordService::IsExperimentalHotwordingEnabled()) {
       hotword_id = extension_misc::kHotwordSharedModuleId;
     }
     prefs_->SetString(hotword_id + ".external_update_url",
                       extension_urls::GetWebstoreUpdateUrl().spec());
   }
 
   {
     std::string extension_id;
-    if (GetBookmarksExperimentExtensionID(&extension_id)) {
+    if (IsEnhancedBookmarksEnabled(&extension_id)) {
       prefs_->SetString(extension_id + ".external_update_url",
                         extension_urls::GetWebstoreUpdateUrl().spec());
     }
   }
 
 #if defined(OS_CHROMEOS)
   {
     base::CommandLine* const command_line =
         base::CommandLine::ForCurrentProcess();
     if (!command_line->HasSwitch(chromeos::switches::kDisableNewZIPUnpacker)) {
       const std::string extension_id = extension_misc::kZIPUnpackerExtensionId;
       prefs_->SetString(extension_id + ".external_update_url",
                         extension_urls::GetWebstoreUpdateUrl().spec());
     }
   }
 #endif
 
 #if defined(ENABLE_APP_LIST) && defined(OS_CHROMEOS)
   std::string google_now_extension_id;
   if (GetGoogleNowExtensionId(&google_now_extension_id)) {
     prefs_->SetString(google_now_extension_id + ".external_update_url",
                       extension_urls::GetWebstoreUpdateUrl().spec());
   }
 #endif
 
   LoadFinished();
 }
 
 }  // namespace extensions