ash:Shelf - Enable Alternate Shelf and Side Shelf by default.

chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser_unittest.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/ash/launcher/chrome_launcher_controller_per_browser.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
+#include "ash/ash_switches.h"
 #include "ash/launcher/launcher_model.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/test_extension_system.h"
 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h"
@@ skipping 12 matching lines @@
 #endif
 
 using extensions::Extension;
 using extensions::Manifest;
 
 class ChromeLauncherControllerPerBrowserTest : public testing::Test {
  protected:
   ChromeLauncherControllerPerBrowserTest()
       : profile_(new TestingProfile()),
         extension_service_(NULL) {
+    CommandLine::ForCurrentProcess()->AppendSwitch(

[Harry McCleave, 2013/08/21 21:34:43]

ChromeLaun...PerBrowser is being removed (cl in the cq atm iirc) thus these
tests are not being updated [duplicated in ChromeLaun...PerApp]

[James Cook, 2013/08/22 00:19:12]

Just FYI: The original removal got reverted, but I'm landing a new removal in
https://codereview.chromium.org/23068021/

+        ash::switches::kAshDisableAlternateShelfLayout);
     DictionaryValue manifest;
     manifest.SetString("name", "launcher controller test extension");
     manifest.SetString("version", "1");
     manifest.SetString("description", "for testing pinned apps");
 
     extensions::TestExtensionSystem* extension_system(
         static_cast<extensions::TestExtensionSystem*>(
             extensions::ExtensionSystem::Get(profile_.get())));
     extension_service_ = extension_system->CreateExtensionService(
         CommandLine::ForCurrentProcess(), base::FilePath(), false);
@@ skipping 400 matching lines @@
 
   GetAppLaunchers(&controller, &actual_launchers);
   EXPECT_EQ(expected_launchers, actual_launchers);
 
   // Install |extension2| and verify it shows up between the other two.
   extension_service_->AddExtension(extension2_.get());
   expected_launchers.insert(expected_launchers.begin() + 1, extension2_->id());
   GetAppLaunchers(&controller, &actual_launchers);
   EXPECT_EQ(expected_launchers, actual_launchers);
 }