Revert 126256 - Show a different icon in the launcher for incognito windows

ash/launcher/launcher_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 "ash/launcher/launcher.h"
 #include "ash/launcher/launcher_button.h"
 #include "ash/launcher/launcher_model.h"
 #include "ash/launcher/launcher_view.h"
 
 #include "ash/shell.h"
@@ skipping 30 matching lines @@
   LauncherView* launcher_view =
       static_cast<LauncherView*>(contents_view->child_at(0));
   LauncherView::TestAPI test(launcher_view);
   LauncherModel* model = launcher->model();
 
   // Initially we have the app list and chrome icon.
   int button_count = test.GetButtonCount();
   int item_count = model->item_count();
 
   // Add closed app.
-  LauncherItem item;
-  item.type = TYPE_APP;
+  LauncherItem item(TYPE_APP);
   model->Add(item_count, item);
   ASSERT_EQ(++button_count, test.GetButtonCount());
   LauncherButton* button = test.GetButton(button_count - 1);
   EXPECT_EQ(LauncherButton::STATE_NORMAL, button->state());
 
   // Open it.
   item = model->items()[item_count];
   item.status = STATUS_RUNNING;
   model->Set(item_count, item);
   EXPECT_EQ(LauncherButton::STATE_RUNNING, button->state());
@@ skipping 17 matching lines @@
   LauncherView* launcher_view =
       static_cast<LauncherView*>(contents_view->child_at(0));
   LauncherView::TestAPI test(launcher_view);
   LauncherModel* model = launcher->model();
 
   // Initially we have the app list and chrome icon.
   int button_count = test.GetButtonCount();
   int item_count = model->item_count();
 
   // Add running tab.
-  LauncherItem item;
-  item.type = TYPE_TABBED;
+  LauncherItem item(TYPE_TABBED);
   item.status = STATUS_RUNNING;
   model->Add(item_count, item);
   ASSERT_EQ(++button_count, test.GetButtonCount());
   LauncherButton* button = test.GetButton(button_count - 1);
   EXPECT_EQ(LauncherButton::STATE_RUNNING, button->state());
 
   // Remove it.
   model->RemoveItemAt(item_count);
   ASSERT_EQ(--button_count, test.GetButtonCount());
 }
 
 }  // namespace ash