Cleanup: Remove ViewProp from aura build

ui/aura/window_unittest.cc

 // Copyright (c) 2011 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 "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/stringprintf.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/aura/desktop.h"
 #include "ui/aura/desktop_observer.h"
 #include "ui/aura/event.h"
 #include "ui/aura/focus_manager.h"
 #include "ui/aura/hit_test.h"
 #include "ui/aura/test/aura_test_base.h"
 #include "ui/aura/test/event_generator.h"
 #include "ui/aura/test/test_desktop_delegate.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/window_delegate.h"
 #include "ui/aura/window_observer.h"
 #include "ui/base/keycodes/keyboard_codes.h"
-#include "ui/base/view_prop.h"
 #include "ui/gfx/canvas_skia.h"
 #include "ui/gfx/compositor/layer.h"
 #include "ui/gfx/screen.h"
 
 namespace aura {
 namespace test {
 
 namespace {
 
 // Used for verifying destruction methods are invoked.
@@ skipping 1098 matching lines @@
                                  desktop_size.height() + 200));
 
   EXPECT_EQ(gfx::Screen::GetMonitorAreaNearestWindow(w1.get()), w1->bounds());
 
   w1->Restore();
   EXPECT_EQ(window_bounds, w1->bounds());
 }
 
 TEST_F(WindowTest, Property) {
   scoped_ptr<Window> w(CreateTestWindowWithId(0, NULL));
-  const gfx::NativeView target = const_cast<const gfx::NativeView>(w.get());
   const char* key = "test";
   EXPECT_EQ(NULL, w->GetProperty(key));
-  EXPECT_EQ(NULL, ui::ViewProp::GetValue(target, key));
 
   void* value = reinterpret_cast<void*>(static_cast<intptr_t>(1));
   w->SetProperty(key, value);
   EXPECT_EQ(value, w->GetProperty(key));
-  EXPECT_EQ(value, ui::ViewProp::GetValue(target, key));
 
   // Overwrite the property with different value type.
   w->SetProperty(key, static_cast<void*>(const_cast<char*>("string")));
   std::string expected("string");
   EXPECT_EQ(expected,
             static_cast<const char*>(w->GetProperty(key)));
-  EXPECT_EQ(expected,
-            static_cast<const char*>(ui::ViewProp::GetValue(target, key)));
 
   // Non-existent property.
   EXPECT_EQ(NULL, w->GetProperty("foo"));
-  EXPECT_EQ(NULL, ui::ViewProp::GetValue(target, "foo"));
 
   // Set NULL and make sure the property is gone.
   w->SetProperty(key, NULL);
   EXPECT_EQ(NULL, w->GetProperty(key));
-  EXPECT_EQ(NULL, ui::ViewProp::GetValue(target, key));
 }
 
 class WindowObserverTest : public WindowTest,
                            public WindowObserver {
  public:
   struct VisibilityInfo {
     bool window_visible;
     bool visible_param;
   };
 
@@ skipping 184 matching lines @@
 
   w3->Activate();
   EXPECT_EQ(w2.get(), active());
 
   w1->Activate();
   EXPECT_EQ(w1.get(), active());
 }
 
 }  // namespace test
 }  // namespace aura