Rename BaseNativeAppWindowViews and NativeAppWindowViews

chrome/browser/ui/views/apps/shaped_app_window_targeter_unittest.cc

 // Copyright 2014 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/views/apps/shaped_app_window_targeter.h"
 
-#include "chrome/browser/ui/views/apps/native_app_window_views.h"
+#include "chrome/browser/ui/views/apps/chrome_native_app_window_views.h"
 #include "ui/aura/test/aura_test_base.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/views/controls/webview/webview.h"
 #include "ui/wm/public/easy_resize_window_targeter.h"
 
 class ShapedAppWindowTargeterTest : public aura::test::AuraTestBase {
  public:
   ShapedAppWindowTargeterTest()
       : web_view_(NULL) {
   }
 
   virtual ~ShapedAppWindowTargeterTest() {}
 
   views::Widget* widget() { return widget_.get(); }
 
   apps::NativeAppWindow* app_window() { return &app_window_; }
-  NativeAppWindowViews* app_window_views() { return &app_window_; }
+  ChromeNativeAppWindowViews* app_window_views() { return &app_window_; }
 
  protected:
   virtual void SetUp() OVERRIDE {
     aura::test::AuraTestBase::SetUp();
     widget_.reset(new views::Widget);
     views::Widget::InitParams params(views::Widget::InitParams::TYPE_WINDOW);
     params.remove_standard_frame = true;
     params.bounds = gfx::Rect(30, 30, 100, 100);
     params.context = root_window();
     params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
     widget_->Init(params);
 
     app_window_.set_web_view_for_testing(&web_view_);
     app_window_.set_window_for_testing(widget_.get());
 
     widget_->Show();
   }
 
   virtual void TearDown() OVERRIDE {
     widget_.reset();
     aura::test::AuraTestBase::TearDown();
   }
 
  private:
   views::WebView web_view_;
   scoped_ptr<views::Widget> widget_;
-  NativeAppWindowViews app_window_;
+  ChromeNativeAppWindowViews app_window_;
 
   DISALLOW_COPY_AND_ASSIGN(ShapedAppWindowTargeterTest);
 };
 
 TEST_F(ShapedAppWindowTargeterTest, HitTestBasic) {
   aura::Window* window = widget()->GetNativeWindow();
   {
     // Without any custom shapes, the event should be targeted correctly to the
     // window.
     ui::MouseEvent move(ui::ET_MOUSE_MOVED,
@@ skipping 131 matching lines @@
     // inside the window and within 5px of an edge should have
     // root_window() as its target.
     ui::MouseEvent move(ui::ET_MOUSE_MOVED,
                         gfx::Point(32, 37), gfx::Point(32, 37),
                         ui::EF_NONE, ui::EF_NONE);
     ui::EventDispatchDetails details = dispatcher()->OnEventFromSource(&move);
     ASSERT_FALSE(details.dispatcher_destroyed);
     EXPECT_EQ(root_window(), move.target());
   }
 }