Revert 151293 - Makes Window not change focus and send out notifications when moving

ui/aura/window_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 "ui/aura/window.h"
 
 #include <utility>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
-#include "base/string_number_conversions.h"
 #include "base/stringprintf.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/aura/client/capture_client.h"
 #include "ui/aura/client/stacking_client.h"
 #include "ui/aura/client/visibility_client.h"
 #include "ui/aura/layout_manager.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/root_window_host.h"
 #include "ui/aura/root_window_observer.h"
 #include "ui/aura/test/aura_test_base.h"
@@ skipping 2433 matching lines @@
       window->layer()->GetAnimator()->last_step_time();
   ui::AnimationContainerElement* element = window->layer()->GetAnimator();
   element->Step(start_time + base::TimeDelta::FromMilliseconds(1000));
 
   // No bounds changed notification at the end of animation since layer
   // delegate is NULL.
   EXPECT_FALSE(delegate.bounds_changed());
   EXPECT_NE("0,0 100x100", window->bounds().ToString());
 }
 
-namespace {
-
-// Used by AddChildNotifications to track notification counts.
-class AddChildNotificationsObserver : public WindowObserver {
- public:
-  AddChildNotificationsObserver() : added_count_(0), removed_count_(0) {}
-
-  std::string CountStringAndReset() {
-    std::string result = base::IntToString(added_count_) + " " +
-        base::IntToString(removed_count_);
-    added_count_ = removed_count_ = 0;
-    return result;
-  }
-
-  // WindowObserver overrides:
-  virtual void OnWindowAddedToRootWindow(Window* window) OVERRIDE {
-    added_count_++;
-  }
-  virtual void OnWindowRemovingFromRootWindow(Window* window) OVERRIDE {
-    removed_count_++;
-  }
-
- private:
-  int added_count_;
-  int removed_count_;
-
-  DISALLOW_COPY_AND_ASSIGN(AddChildNotificationsObserver);
-};
-
-}  // namespace
-
-// Assertions around when root window notifications are sent.
-TEST_F(WindowTest, AddChildNotifications) {
-  AddChildNotificationsObserver observer;
-  scoped_ptr<Window> w1(CreateTestWindowWithId(1, NULL));
-  scoped_ptr<Window> w2(CreateTestWindowWithId(1, NULL));
-  w2->AddObserver(&observer);
-  w2->Focus();
-  EXPECT_TRUE(w2->HasFocus());
-
-  // Move |w2| to be a child of |w1|.
-  w1->AddChild(w2.get());
-  // Sine we moved in the same root, observer shouldn't be notified.
-  EXPECT_EQ("0 0", observer.CountStringAndReset());
-  // |w2| should still have focus after moving.
-  EXPECT_TRUE(w2->HasFocus());
-}
-
 }  // namespace test
 }  // namespace aura