Remove experimental sync promo layouts

chrome/browser/ui/webui/sync_promo/sync_promo_ui.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/ui/webui/sync_promo/sync_promo_ui.h"
 
 #include "base/command_line.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/first_run/first_run.h"
@@ skipping 155 matching lines @@
   prefs->RegisterBooleanPref(
       prefs::kSyncPromoUserSkipped, false, PrefService::UNSYNCABLE_PREF);
   prefs->RegisterBooleanPref(prefs::kSyncPromoShowOnFirstRunAllowed, true,
       PrefService::UNSYNCABLE_PREF);
 
   SyncPromoHandler::RegisterUserPrefs(prefs);
 }
 
 // static
 bool SyncPromoUI::ShouldShowSyncPromoAtStartup(Profile* profile,
-                                               bool is_new_profile,
-                                               bool* promo_suppressed) {
+                                               bool is_new_profile) {
   DCHECK(profile);
-  DCHECK(promo_suppressed);
-  *promo_suppressed = false;
 
   if (!ShouldShowSyncPromo(profile))
     return false;
 
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   if (command_line.HasSwitch(switches::kNoFirstRun))
     is_new_profile = false;
 
   if (!is_new_profile) {
     if (!HasShownPromoAtStartup(profile))
       return false;
   }
 
   if (HasUserSkippedSyncPromo(profile))
     return false;
 
   // For Chinese users skip the sync promo.
   if (g_browser_process->GetApplicationLocale() == "zh-CN")
     return false;
 
   PrefService* prefs = profile->GetPrefs();
   int show_count = prefs->GetInteger(prefs::kSyncPromoStartupCount);
   if (show_count >= kSyncPromoShowAtStartupMaximum)
     return false;
 
-  // If the current install is part of trial then let the trial determine if we
-  // should show the promo or not.
-  switch (sync_promo_trial::GetStartupOverrideForCurrentTrial()) {
-    case sync_promo_trial::STARTUP_OVERRIDE_NONE:
-      // No override so simply continue.
-      break;
-    case sync_promo_trial::STARTUP_OVERRIDE_SHOW:
-      return true;
-    case sync_promo_trial::STARTUP_OVERRIDE_HIDE:
-      *promo_suppressed = true;
-      return false;
-  }
-
   // This pref can be set in the master preferences file to allow or disallow
   // showing the sync promo at startup.
   if (prefs->HasPrefPath(prefs::kSyncPromoShowOnFirstRunAllowed))
     return prefs->GetBoolean(prefs::kSyncPromoShowOnFirstRunAllowed);
 
   // For now don't show the promo for some brands.
   if (!AllowPromoAtStartupForCurrentBrand())
     return false;
 
   // Default to show the promo for Google Chrome builds.
@@ skipping 62 matching lines @@
   }
   return GURL();
 }
 
 // static
 std::string SyncPromoUI::GetSourceForSyncPromoURL(const GURL& url) {
   std::string value;
   return GetValueForKeyInQuery(url, kSyncPromoQueryKeySource, &value) ?
       value : std::string();
 }
-
-// static
-SyncPromoUI::Version SyncPromoUI::GetSyncPromoVersion() {
-  Version version;
-  if (sync_promo_trial::GetSyncPromoVersionForCurrentTrial(&version)) {
-    // Currently the sync promo dialog has two problems. First, it's not modal
-    // so the user can interact with other browser windows. Second, it uses
-    // a nested message loop that can cause the sync promo page not to render.
-    // To work around these problems the sync promo dialog is only shown for
-    // the first profile. TODO(sail): Fix these issues if the sync promo dialog
-    // is more widely deployed.
-    ProfileInfoCache& cache =
-        g_browser_process->profile_manager()->GetProfileInfoCache();
-    if (cache.GetNumberOfProfiles() > 1 &&
-        version == SyncPromoUI::VERSION_DIALOG) {
-      return SyncPromoUI::VERSION_SIMPLE;
-    }
-    return version;
-  }
-
-  return VERSION_SIMPLE;
-}