Revert 133089 - Implement LauncherIconObserver.

This will be used to listen for changes in the launcher view so that panels can be correctly drawn over the corresponding launcher icon.

BUG=124115
TEST=aura_shell_unittests

Review URL: https://chromiumcodereview.appspot.com/10116011

TBR=dcheng@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10142005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@133103 0039d316-1c4b-4281-b951-d872f2087c98

11 files changed, 9 insertions, 372 deletions

diff --git a/ash/ash.gyp b/ash/ash.gyp
index 172059f..d97d325 100644
--- a/ash/ash.gyp
+++ b/ash/ash.gyp
@@ -91,7 +91,6 @@
         'launcher/launcher_context_menu.cc',
         'launcher/launcher_context_menu.h',
         'launcher/launcher_delegate.h',
-        'launcher/launcher_icon_observer.h',
         'launcher/launcher_model.cc',
         'launcher/launcher_model.h',
         'launcher/launcher_model_observer.h',
@@ -341,7 +340,6 @@
         'launcher/launcher_context_menu_unittest.cc',
         'launcher/launcher_model_unittest.cc',
         'launcher/launcher_unittest.cc',
-        'launcher/launcher_view_unittest.cc',
         'monitor/multi_monitor_manager_unittest.cc',
         'shell_unittest.cc',
         'test/ash_unittests.cc',
@@ -349,8 +347,6 @@
         'test/ash_test_base.h',
         'test/test_activation_delegate.cc',
         'test/test_activation_delegate.h',
-        'test/test_launcher_delegate.cc',
-        'test/test_launcher_delegate.h',
         'test/test_shell_delegate.cc',
         'test/test_shell_delegate.h',
         'test/test_suite.cc',
diff --git a/ash/launcher/launcher.cc b/ash/launcher/launcher.cc
index afb05dc..5516442 100644
--- a/ash/launcher/launcher.cc
+++ b/ash/launcher/launcher.cc
@@ -186,14 +186,6 @@ gfx::Rect Launcher::GetScreenBoundsOfItemIconForWindow(aura::Window* window) {
                    bounds.height());
 }
 
-void Launcher::AddIconObserver(LauncherIconObserver* observer) {
-  launcher_view_->AddIconObserver(observer);
-}
-
-void Launcher::RemoveIconObserver(LauncherIconObserver* observer) {
-  launcher_view_->RemoveIconObserver(observer);
-}
-
 bool Launcher::IsShowingMenu() const {
   return launcher_view_->IsShowingMenu();
 }
diff --git a/ash/launcher/launcher.h b/ash/launcher/launcher.h
index 7955b07..ebc56b8 100644
--- a/ash/launcher/launcher.h
+++ b/ash/launcher/launcher.h
@@ -30,7 +30,6 @@ class FocusCycler;
 class LauncherView;
 }
 
-class LauncherIconObserver;
 class LauncherDelegate;
 class LauncherModel;
 
@@ -57,9 +56,6 @@ class ASH_EXPORT Launcher : public internal::BackgroundAnimatorDelegate {
   // no item for the specified window an empty rect is returned.
   gfx::Rect GetScreenBoundsOfItemIconForWindow(aura::Window* window);
 
-  void AddIconObserver(LauncherIconObserver* observer);
-  void RemoveIconObserver(LauncherIconObserver* observer);
-
   // Returns true if the Launcher is showing a context menu.
   bool IsShowingMenu() const;
 
diff --git a/ash/launcher/launcher_icon_observer.h b/ash/launcher/launcher_icon_observer.h
deleted file mode 100644
index 5b24e92..0000000
--- a/ash/launcher/launcher_icon_observer.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// 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.
-
-#ifndef ASH_LAUNCHER_LAUNCHER_ICON_OBSERVER_H_
-#define ASH_LAUNCHER_LAUNCHER_ICON_OBSERVER_H_
-#pragma once
-
-#include "base/basictypes.h"
-
-namespace ash {
-
-class ASH_EXPORT LauncherIconObserver {
- public:
-  LauncherIconObserver() {}
-
-  // Invoked when any icon on launcher changes position.
-  virtual void OnLauncherIconPositionsChanged() = 0;
-
- protected:
-  virtual ~LauncherIconObserver() {}
-
-  DISALLOW_COPY_AND_ASSIGN(LauncherIconObserver);
-};
-
-}  // namespace ash
-
-#endif  // ASH_LAUNCHER_LAUNCHER_ICON_OBSERVER_H_
diff --git a/ash/launcher/launcher_view.cc b/ash/launcher/launcher_view.cc
index d19d334..f844b7e 100644
--- a/ash/launcher/launcher_view.cc
+++ b/ash/launcher/launcher_view.cc
@@ -6,7 +6,6 @@
 
 #include "ash/launcher/launcher_button.h"
 #include "ash/launcher/launcher_delegate.h"
-#include "ash/launcher/launcher_icon_observer.h"
 #include "ash/launcher/launcher_model.h"
 #include "ash/launcher/tabbed_launcher_button.h"
 #include "ash/shell.h"
@@ -256,7 +255,6 @@ LauncherView::LauncherView(LauncherModel* model, LauncherDelegate* delegate)
     : model_(model),
       delegate_(delegate),
       view_model_(new views::ViewModel),
-      last_visible_index_(-1),
       overflow_button_(NULL),
       dragging_(NULL),
       drag_view_(NULL),
@@ -307,7 +305,7 @@ void LauncherView::Init() {
 
 gfx::Rect LauncherView::GetIdealBoundsOfItemIcon(LauncherID id) {
   int index = model_->ItemIndexByID(id);
-  if (index == -1 || index > last_visible_index_)
+  if (index == -1 || !view_model_->view_at(index)->visible())
     return gfx::Rect();
   const gfx::Rect& ideal_bounds(view_model_->ideal_bounds(index));
   DCHECK_NE(TYPE_APP_LIST, model_->items()[index].type);
@@ -366,19 +364,19 @@ void LauncherView::CalculateIdealBounds(IdealBounds* bounds) {
   }
 
   bounds->overflow_bounds.set_size(gfx::Size(kButtonWidth, kButtonHeight));
-  last_visible_index_ = DetermineLastVisibleIndex(
+  int last_visible_index = DetermineLastVisibleIndex(
       available_width - kLeadingInset - bounds->overflow_bounds.width() -
       kButtonSpacing - kButtonWidth);
   bool show_overflow =
-      (last_visible_index_ + 1 != view_model_->view_size());
+      (last_visible_index + 1 != view_model_->view_size());
   int app_list_index = view_model_->view_size() - 1;
   if (overflow_button_->visible() != show_overflow) {
     // Only change visibility of the views if the visibility of the overflow
     // button changes. Otherwise we'll effect the insertion animation, which
     // changes the visibility.
-    for (int i = 0; i <= last_visible_index_; ++i)
+    for (int i = 0; i <= last_visible_index; ++i)
       view_model_->view_at(i)->SetVisible(true);
-    for (int i = last_visible_index_ + 1; i < view_model_->view_size(); ++i) {
+    for (int i = last_visible_index + 1; i < view_model_->view_size(); ++i) {
       if (i != app_list_index)
         view_model_->view_at(i)->SetVisible(false);
     }
@@ -388,8 +386,8 @@ void LauncherView::CalculateIdealBounds(IdealBounds* bounds) {
     DCHECK_NE(0, view_model_->view_size());
     // We always want the app list visible.
     gfx::Rect app_list_bounds = view_model_->ideal_bounds(app_list_index);
-    x = last_visible_index_ == -1 ?
-        kLeadingInset : view_model_->ideal_bounds(last_visible_index_).right();
+    x = last_visible_index == -1 ?
+        kLeadingInset : view_model_->ideal_bounds(last_visible_index).right();
     app_list_bounds.set_x(x);
     view_model_->set_ideal_bounds(app_list_index, app_list_bounds);
     x = app_list_bounds.right() + kButtonSpacing;
@@ -406,14 +404,6 @@ int LauncherView::DetermineLastVisibleIndex(int max_x) {
   return index;
 }
 
-void LauncherView::AddIconObserver(LauncherIconObserver* observer) {
-  observers_.AddObserver(observer);
-}
-
-void LauncherView::RemoveIconObserver(LauncherIconObserver* observer) {
-  observers_.RemoveObserver(observer);
-}
-
 void LauncherView::AnimateToIdealBounds() {
   IdealBounds ideal_bounds;
   CalculateIdealBounds(&ideal_bounds);
@@ -551,9 +541,6 @@ void LauncherView::ContinueDrag(const views::MouseEvent& event) {
   view_model_->Move(current_index, target_index);
   AnimateToIdealBounds();
   bounds_animator_->StopAnimatingView(drag_view_);
-
-  FOR_EACH_OBSERVER(LauncherIconObserver, observers_,
-                    OnLauncherIconPositionsChanged());
 }
 
 bool LauncherView::SameDragType(LauncherItemType typea,
@@ -675,8 +662,6 @@ gfx::Size LauncherView::GetPreferredSize() {
 
 void LauncherView::OnBoundsChanged(const gfx::Rect& previous_bounds) {
   LayoutToIdealBounds();
-  FOR_EACH_OBSERVER(LauncherIconObserver, observers_,
-                    OnLauncherIconPositionsChanged());
 }
 
 views::FocusTraversable* LauncherView::GetPaneFocusTraversable() {
@@ -708,9 +693,6 @@ void LauncherView::LauncherItemAdded(int model_index) {
     bounds_animator_->SetAnimationDelegate(
         view, new StartFadeAnimationDelegate(this, view), true);
   }
-
-  FOR_EACH_OBSERVER(LauncherIconObserver, observers_,
-                    OnLauncherIconPositionsChanged());
 }
 
 void LauncherView::LauncherItemRemoved(int model_index, LauncherID id) {
@@ -726,14 +708,6 @@ void LauncherView::LauncherItemRemoved(int model_index, LauncherID id) {
   bounds_animator_->AnimateViewTo(view, view->bounds());
   bounds_animator_->SetAnimationDelegate(
       view, new FadeOutAnimationDelegate(this, view), true);
-
-  // The animation will eventually update the ideal bounds, but we want to
-  // force an update immediately so we can notify launcher icon observers.
-  IdealBounds ideal_bounds;
-  CalculateIdealBounds(&ideal_bounds);
-
-  FOR_EACH_OBSERVER(LauncherIconObserver, observers_,
-                    OnLauncherIconPositionsChanged());
 }
 
 void LauncherView::LauncherItemChanged(int model_index,
@@ -783,8 +757,6 @@ void LauncherView::LauncherItemChanged(int model_index,
 void LauncherView::LauncherItemMoved(int start_index, int target_index) {
   view_model_->Move(start_index, target_index);
   AnimateToIdealBounds();
-  FOR_EACH_OBSERVER(LauncherIconObserver, observers_,
-                    OnLauncherIconPositionsChanged());
 }
 
 void LauncherView::LauncherItemWillChange(int index) {
diff --git a/ash/launcher/launcher_view.h b/ash/launcher/launcher_view.h
index f367c3a..dc1d8d1 100644
--- a/ash/launcher/launcher_view.h
+++ b/ash/launcher/launcher_view.h
@@ -11,7 +11,6 @@
 
 #include "ash/launcher/launcher_button_host.h"
 #include "ash/launcher/launcher_model_observer.h"
-#include "base/observer_list.h"
 #include "ui/views/context_menu_controller.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/focus/focus_manager.h"
@@ -28,7 +27,6 @@ namespace ash {
 
 class LauncherDelegate;
 struct LauncherItem;
-class LauncherIconObserver;
 class LauncherModel;
 
 namespace internal {
@@ -68,9 +66,6 @@ class ASH_EXPORT LauncherView : public views::View,
   // isn't know.
   gfx::Rect GetIdealBoundsOfItemIcon(LauncherID id);
 
-  void AddIconObserver(LauncherIconObserver* observer);
-  void RemoveIconObserver(LauncherIconObserver* observer);
-
   // Returns true if we're showing a menu.
   bool IsShowingMenu() const;
 
@@ -174,10 +169,6 @@ class ASH_EXPORT LauncherView : public views::View,
   // item in |model_|.
   scoped_ptr<views::ViewModel> view_model_;
 
-  // Last index of a launcher button that is visible
-  // (does not go into overflow).
-  int last_visible_index_;
-
   scoped_ptr<views::BoundsAnimator> bounds_animator_;
 
   views::ImageButton* overflow_button_;
@@ -207,8 +198,6 @@ class ASH_EXPORT LauncherView : public views::View,
   scoped_ptr<views::MenuRunner> launcher_menu_runner_;
 #endif
 
-  ObserverList<LauncherIconObserver> observers_;
-
   DISALLOW_COPY_AND_ASSIGN(LauncherView);
 };
 
diff --git a/ash/launcher/launcher_view_unittest.cc b/ash/launcher/launcher_view_unittest.cc
deleted file mode 100644
index 78836f6..0000000
--- a/ash/launcher/launcher_view_unittest.cc
+++ /dev/null
@@ -1,104 +0,0 @@
-// 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_view.h"
-
-#include "ash/ash_switches.h"
-#include "ash/launcher/launcher.h"
-#include "ash/launcher/launcher_icon_observer.h"
-#include "ash/shell.h"
-#include "ash/shell_window_ids.h"
-#include "ash/test/ash_test_base.h"
-#include "ash/test/test_launcher_delegate.h"
-#include "base/basictypes.h"
-#include "base/command_line.h"
-#include "base/compiler_specific.h"
-#include "ui/aura/window.h"
-#include "ui/views/widget/widget.h"
-#include "ui/views/widget/widget_delegate.h"
-
-namespace ash {
-
-namespace {
-
-class TestLauncherIconObserver : public LauncherIconObserver {
- public:
-  TestLauncherIconObserver() : count_(0) {
-    Shell::GetInstance()->launcher()->AddIconObserver(this);
-  }
-
-  virtual ~TestLauncherIconObserver() {
-    Shell::GetInstance()->launcher()->RemoveIconObserver(this);
-  }
-
-  // LauncherIconObserver implementation.
-  void OnLauncherIconPositionsChanged() OVERRIDE {
-    count_++;
-  }
-
-  int count() const { return count_; }
-  void Reset() { count_ = 0; }
-
- private:
-  int count_;
-
-  DISALLOW_COPY_AND_ASSIGN(TestLauncherIconObserver);
-};
-
-class LauncherViewTest : public ash::test::AshTestBase {
- public:
-  LauncherViewTest() {}
-  virtual ~LauncherViewTest() {}
-
-  virtual void SetUp() OVERRIDE {
-    AshTestBase::SetUp();
-    observer_.reset(new TestLauncherIconObserver);
-  }
-
-  virtual void TearDown() OVERRIDE {
-    observer_.reset();
-    AshTestBase::TearDown();
-  }
-
-  TestLauncherIconObserver* observer() { return observer_.get(); }
-
- private:
-  scoped_ptr<TestLauncherIconObserver> observer_;
-
-  DISALLOW_COPY_AND_ASSIGN(LauncherViewTest);
-};
-
-TEST_F(LauncherViewTest, AddRemove) {
-  ash::test::TestLauncherDelegate* launcher_delegate =
-      ash::test::TestLauncherDelegate::instance();
-  ASSERT_TRUE(launcher_delegate);
-
-  views::Widget::InitParams params(views::Widget::InitParams::TYPE_WINDOW);
-  params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
-  params.bounds = gfx::Rect(0, 0, 200, 200);
-
-  scoped_ptr<views::Widget> widget(new views::Widget());
-  widget->Init(params);
-  launcher_delegate->AddLauncherItem(widget->GetNativeWindow());
-  EXPECT_EQ(1, observer()->count());
-  observer()->Reset();
-
-  widget->Show();
-  widget->GetNativeWindow()->parent()->RemoveChild(widget->GetNativeWindow());
-  EXPECT_EQ(1, observer()->count());
-  observer()->Reset();
-}
-
-TEST_F(LauncherViewTest, BoundsChanged) {
-  Launcher* launcher = Shell::GetInstance()->launcher();
-  int total_width = launcher->widget()->GetWindowScreenBounds().width();
-  ASSERT_GT(total_width, 0);
-  launcher->SetStatusWidth(total_width / 2);
-  EXPECT_EQ(1, observer()->count());
-  observer()->Reset();
-}
-
-}  // namespace
-
-}  // namespace ash
diff --git a/ash/test/test_launcher_delegate.cc b/ash/test/test_launcher_delegate.cc
deleted file mode 100644
index 5dab5c6..0000000
--- a/ash/test/test_launcher_delegate.cc
+++ /dev/null
@@ -1,104 +0,0 @@
-// 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/test/test_launcher_delegate.h"
-
-#include "ash/launcher/launcher_model.h"
-#include "ash/wm/window_util.h"
-#include "base/utf_string_conversions.h"
-#include "grit/ui_resources.h"
-#include "ui/aura/window.h"
-
-namespace ash {
-namespace test {
-
-TestLauncherDelegate* TestLauncherDelegate::instance_ = NULL;
-
-TestLauncherDelegate::TestLauncherDelegate(LauncherModel* model)
-    : model_(model) {
-  CHECK(!instance_);
-  instance_ = this;
-}
-
-TestLauncherDelegate::~TestLauncherDelegate() {
-  instance_ = NULL;
-}
-
-void TestLauncherDelegate::AddLauncherItem(aura::Window* window) {
-  ash::LauncherItem item;
-  item.type = ash::TYPE_TABBED;
-  DCHECK(window_to_id_.find(window) == window_to_id_.end());
-  window_to_id_[window] = model_->next_id();
-  item.image.setConfig(SkBitmap::kARGB_8888_Config, 16, 16);
-  item.image.allocPixels();
-  model_->Add(item);
-  if (observed_windows_.find(window->parent()) == observed_windows_.end()) {
-    window->parent()->AddObserver(this);
-    observed_windows_.insert(window->parent());
-  }
-}
-
-void TestLauncherDelegate::OnWillRemoveWindow(aura::Window* window) {
-  ash::LauncherID id = GetIDByWindow(window);
-  if (id == 0)
-    return;
-  int index = model_->ItemIndexByID(id);
-  DCHECK_NE(-1, index);
-  model_->RemoveItemAt(index);
-  window_to_id_.erase(window);
-  ObservedWindows::iterator it = observed_windows_.find(window->parent());
-  if (it != observed_windows_.end()) {
-    window->parent()->RemoveObserver(this);
-    observed_windows_.erase(it);
-  }
-}
-
-void TestLauncherDelegate::CreateNewTab() {
-}
-
-void TestLauncherDelegate::CreateNewWindow() {
-}
-
-void TestLauncherDelegate::ItemClicked(const ash::LauncherItem& item) {
-  aura::Window* window = GetWindowByID(item.id);
-  window->Show();
-  ash::wm::ActivateWindow(window);
-}
-
-int TestLauncherDelegate::GetBrowserShortcutResourceId() {
-  return IDR_AURA_LAUNCHER_BROWSER_SHORTCUT;
-}
-
-string16 TestLauncherDelegate::GetTitle(const ash::LauncherItem& item) {
-  return GetWindowByID(item.id)->title();
-}
-
-ui::MenuModel* TestLauncherDelegate::CreateContextMenu(
-    const ash::LauncherItem& item) {
-  return NULL;
-}
-
-ui::MenuModel* TestLauncherDelegate::CreateContextMenuForLauncher() {
-  return NULL;
-}
-
-ash::LauncherID TestLauncherDelegate::GetIDByWindow(aura::Window* window) {
-  WindowToID::const_iterator found = window_to_id_.find(window);
-  if (found == window_to_id_.end())
-    return 0;
-  return found->second;
-}
-
-aura::Window* TestLauncherDelegate::GetWindowByID(ash::LauncherID id) {
-  for (WindowToID::const_iterator it = window_to_id_.begin();
-      it != window_to_id_.end();
-      it++) {
-    if (it->second == id)
-      return it->first;
-  }
-  return NULL;
-}
-
-}  // namespace test
-}  // namespace ash
diff --git a/ash/test/test_launcher_delegate.h b/ash/test/test_launcher_delegate.h
deleted file mode 100644
index bfb59df..0000000
--- a/ash/test/test_launcher_delegate.h
+++ /dev/null
@@ -1,69 +0,0 @@
-// 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.
-
-#ifndef ASH_TEST_TEST_LAUNCHER_DELEGATE_H_
-#define ASH_TEST_TEST_LAUNCHER_DELEGATE_H_
-#pragma once
-
-#include <map>
-#include <set>
-
-#include "ash/launcher/launcher_delegate.h"
-#include "base/compiler_specific.h"
-#include "ui/aura/window_observer.h"
-
-namespace ash {
-
-class LauncherModel;
-
-namespace test {
-
-// Test implementation of LauncherDelegate.
-// Tests may create icons for windows by calling AddLauncherItem
-class TestLauncherDelegate : public LauncherDelegate,
-                             public aura::WindowObserver {
- public:
-  explicit TestLauncherDelegate(LauncherModel* model);
-  ~TestLauncherDelegate();
-
-  void AddLauncherItem(aura::Window* window);
-
-  static TestLauncherDelegate* instance() { return instance_; }
-
-  // WindowObserver implementation
-  void OnWillRemoveWindow(aura::Window* window) OVERRIDE;
-
-  // LauncherDelegate implementation.
-  virtual void CreateNewTab() OVERRIDE;
-  virtual void CreateNewWindow() OVERRIDE;
-  virtual void ItemClicked(const LauncherItem& item) OVERRIDE;
-  virtual int GetBrowserShortcutResourceId() OVERRIDE;
-  virtual string16 GetTitle(const LauncherItem& item) OVERRIDE;
-  virtual ui::MenuModel* CreateContextMenu(const LauncherItem& item) OVERRIDE;
-  virtual ui::MenuModel* CreateContextMenuForLauncher() OVERRIDE;
-  virtual ash::LauncherID GetIDByWindow(aura::Window* window) OVERRIDE;
-
- private:
-  typedef std::map<aura::Window*, ash::LauncherID> WindowToID;
-  typedef std::set<aura::Window*> ObservedWindows;
-
-  static TestLauncherDelegate* instance_;
-
-  aura::Window* GetWindowByID(ash::LauncherID id);
-
-  LauncherModel* model_;
-
-  // Maps from window to the id we gave it.
-  WindowToID window_to_id_;
-
-  // Parent windows we are watching.
-  ObservedWindows observed_windows_;
-
-  DISALLOW_COPY_AND_ASSIGN(TestLauncherDelegate);
-};
-
-}  // namespace test
-}  // namespace ash
-
-#endif  // ASH_TEST_TEST_LAUNCHER_DELEGATE
diff --git a/ash/test/test_shell_delegate.cc b/ash/test/test_shell_delegate.cc
index d24d34b..dfb1112 100644
--- a/ash/test/test_shell_delegate.cc
+++ b/ash/test/test_shell_delegate.cc
@@ -9,7 +9,6 @@
 #include "ash/screenshot_delegate.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
-#include "ash/test/test_launcher_delegate.h"
 #include "grit/ui_resources.h"
 #include "ui/aura/window.h"
 
@@ -59,7 +58,7 @@ void TestShellDelegate::StartPartialScreenshot(
 
 LauncherDelegate* TestShellDelegate::CreateLauncherDelegate(
     ash::LauncherModel* model) {
-  return new TestLauncherDelegate(model);
+  return NULL;
 }
 
 SystemTrayDelegate* TestShellDelegate::CreateSystemTrayDelegate(
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 46163fc..94d88fe 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -2115,9 +2115,6 @@
         'test/data/unit/framework_unittest.gtestjs',
         'test/logging/win/mof_data_parser_unittest.cc',
         'tools/convert_dict/convert_dict_unittest.cc',
-        '../ash/test/test_launcher_delegate.cc',
-        '../ash/test/test_launcher_delegate.h',
-        '../ash/test/test_shell_delegate.cc',
         '../testing/gtest_mac_unittest.mm',
         '../third_party/cld/encodings/compact_lang_det/compact_lang_det_unittest_small.cc',
         '../tools/json_schema_compiler/test/additional_properties_unittest.cc',
@@ -2144,6 +2141,7 @@
         '../webkit/fileapi/mock_file_system_options.h',
         '../webkit/quota/mock_storage_client.cc',
         '../webkit/quota/mock_storage_client.h',
+        '../ash/test/test_shell_delegate.cc',
       ],
       'conditions': [
         ['enable_background==0', {