Remove experimental sync promo layouts

chrome/browser/ui/webui/sync_promo/sync_promo_handler.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_handler.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/metrics/histogram.h"
 #include "base/time.h"
@@ skipping 183 matching lines @@
       BrowserList::FindBrowserWithWebContents(web_ui()->GetWebContents());
   if (!browser || !browser->IsAttemptingToCloseBrowser()) {
     GURL url = SyncPromoUI::GetNextPageURLForSyncPromoURL(
         web_ui()->GetWebContents()->GetURL());
     OpenURLParams params(
         url, Referrer(), CURRENT_TAB, content::PAGE_TRANSITION_LINK, false);
     web_ui()->GetWebContents()->OpenURL(params);
   }
 }
 
-int SyncPromoHandler::GetPromoVersion() {
-  switch (SyncPromoUI::GetSyncPromoVersion()) {
-    case SyncPromoUI::VERSION_DEFAULT:
-      return 0;
-    case SyncPromoUI::VERSION_DEVICES:
-      return 1;
-    case SyncPromoUI::VERSION_VERBOSE:
-      return 2;
-    case SyncPromoUI::VERSION_SIMPLE:
-      return 3;
-    case SyncPromoUI::VERSION_DIALOG:
-      // Use the simple sync promo layout for the dialog version.
-      return 3;
-    default:
-      NOTREACHED();
-      return 0;
-  }
-}
-
 void SyncPromoHandler::HandleInitializeSyncPromo(const base::ListValue* args) {
-  base::FundamentalValue version(GetPromoVersion());
+  // TODO(sail): The version argument is going away, remove this.

[Dan Beam, 2012/03/20 03:35:10]

when is a better time to do this than now?

+  base::FundamentalValue version(3);
   web_ui()->CallJavascriptFunction("SyncSetupOverlay.showPromoVersion",
                                    version);
 
   // Open the sync wizard to the login screen.
   OpenSyncSetup(true);
   // We don't need to compute anything for this, just do this every time.
   RecordUserFlowAction(SYNC_PROMO_VIEWED);
   // Increment view count first and show natural numbers in stats rather than 0
   // based starting point (if it happened to be our first time showing this).
   IncrementViewCountBy(1);
@@ skipping 65 matching lines @@
   // The following call does not use the standard UMA macro because the
   // histogram name is only known at runtime.  The standard macros declare
   // static variables that won't work if the name changes on differnt calls.
   if (!histogram_name_.empty()) {
     base::Histogram* histogram = base::LinearHistogram::FactoryGet(
         histogram_name_, 1, SYNC_PROMO_BUCKET_BOUNDARY,
         SYNC_PROMO_BUCKET_BOUNDARY + 1, base::Histogram::kNoFlags);
     histogram->Add(action);
   }
 }