Replace static/native-desktop-only BrowserList::const_reverse_iterator by desktop specific ...

chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app_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_app.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
 #include "ash/launcher/launcher_model.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.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"
 #include "chrome/browser/ui/ash/launcher/launcher_item_controller.h"
+#include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_list.h"
+#include "chrome/browser/ui/host_desktop.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/browser_with_test_window_test.h"
 #include "chrome/test/base/testing_pref_service_syncable.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/models/menu_model.h"
 
 using extensions::Extension;
 using extensions::Manifest;
 
 namespace {
 const int kExpectedAppIndex = 1;
 const char* gmail_app_id = "pjkljhegncpnkpknbcohdijeoejaedia";
 const char* gmail_url = "https://mail.google.com/mail/u";
 }
 
 class ChromeLauncherControllerPerAppTest : public BrowserWithTestWindowTest {
  protected:
-  ChromeLauncherControllerPerAppTest() : extension_service_(NULL) {
+  ChromeLauncherControllerPerAppTest()
+      : BrowserWithTestWindowTest(chrome::HOST_DESKTOP_TYPE_ASH),
+        extension_service_(NULL) {
   }
 
   virtual void SetUp() OVERRIDE {
     BrowserWithTestWindowTest::SetUp();
 
     DictionaryValue manifest;
     manifest.SetString("name", "launcher controller test extension");
     manifest.SetString("version", "1");
     manifest.SetString("description", "for testing pinned apps");
 
@@ skipping 273 matching lines @@
 
   // Now make the created browser() visible by adding it to the active browser
   // list.
   BrowserList::SetLastActive(browser());
   string16 title1 = ASCIIToUTF16("Test1");
   NavigateAndCommitActiveTabWithTitle(browser(), GURL("http://test1"), title1);
   string16 one_menu_item[] = {title1};
   CheckMenuCreation(&launcher_controller, item_browser, 1, one_menu_item, true);
 
   // Create one more browser/window and check that one more was added.
+  Browser::CreateParams ash_params(profile(), chrome::HOST_DESKTOP_TYPE_ASH);
   scoped_ptr<Browser> browser2(
-      chrome::CreateBrowserWithTestWindowForProfile(profile()));
+      chrome::CreateBrowserWithTestWindowForParams(&ash_params));
   chrome::NewTab(browser2.get());
   BrowserList::SetLastActive(browser2.get());
   string16 title2 = ASCIIToUTF16("Test2");
   NavigateAndCommitActiveTabWithTitle(browser2.get(), GURL("http://test2"),
                                       title2);
 
   // Check that the list contains now two entries - make furthermore sure that
   // the active item is the first entry.
   string16 two_menu_items[] = {title2, title1};
   CheckMenuCreation(&launcher_controller,
@@ skipping 129 matching lines @@
   {
     scoped_ptr<ui::MenuModel> menu(
         launcher_controller.CreateApplicationMenu(item_gmail));
     int first_item =
         (menu->GetTypeAt(0) == ui::MenuModel::TYPE_SEPARATOR) ? 1 : 0;
     menu->ActivatedAt(first_item + 3);
   }
   // Now the active tab should be the second item.
   EXPECT_EQ(0, browser()->tab_strip_model()->active_index());
 }