Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(258)

Side by Side Diff: ui/app_list/views/app_list_view_unittest.cc

Issue 2259753003: Re-write many calls to WrapUnique() with MakeUnique() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « ui/app_list/search/mixer_unittest.cc ('k') | ui/app_list/views/search_box_view.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/app_list/views/app_list_view.h" 5 #include "ui/app_list/views/app_list_view.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 701 matching lines...) Expand 10 before | Expand all | Expand 10 after
712 }; 712 };
713 713
714 class AppListViewTestDesktop : public views::ViewsTestBase, 714 class AppListViewTestDesktop : public views::ViewsTestBase,
715 public ::testing::WithParamInterface<int> { 715 public ::testing::WithParamInterface<int> {
716 public: 716 public:
717 AppListViewTestDesktop() {} 717 AppListViewTestDesktop() {}
718 virtual ~AppListViewTestDesktop() {} 718 virtual ~AppListViewTestDesktop() {}
719 719
720 // testing::Test overrides: 720 // testing::Test overrides:
721 void SetUp() override { 721 void SetUp() override {
722 set_views_delegate( 722 set_views_delegate(base::MakeUnique<AppListViewTestViewsDelegate>(this));
723 base::WrapUnique(new AppListViewTestViewsDelegate(this)));
724 views::ViewsTestBase::SetUp(); 723 views::ViewsTestBase::SetUp();
725 test_context_.reset(new AppListViewTestContext(GetParam(), NULL)); 724 test_context_.reset(new AppListViewTestContext(GetParam(), NULL));
726 } 725 }
727 726
728 void TearDown() override { 727 void TearDown() override {
729 test_context_.reset(); 728 test_context_.reset();
730 views::ViewsTestBase::TearDown(); 729 views::ViewsTestBase::TearDown();
731 } 730 }
732 731
733 protected: 732 protected:
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
857 AppListViewTestAura, 856 AppListViewTestAura,
858 ::testing::Range<int>(TEST_TYPE_START, TEST_TYPE_END)); 857 ::testing::Range<int>(TEST_TYPE_START, TEST_TYPE_END));
859 #endif 858 #endif
860 859
861 INSTANTIATE_TEST_CASE_P(AppListViewTestDesktopInstance, 860 INSTANTIATE_TEST_CASE_P(AppListViewTestDesktopInstance,
862 AppListViewTestDesktop, 861 AppListViewTestDesktop,
863 ::testing::Range<int>(TEST_TYPE_START, TEST_TYPE_END)); 862 ::testing::Range<int>(TEST_TYPE_START, TEST_TYPE_END));
864 863
865 } // namespace test 864 } // namespace test
866 } // namespace app_list 865 } // namespace app_list
OLDNEW
« no previous file with comments | « ui/app_list/search/mixer_unittest.cc ('k') | ui/app_list/views/search_box_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698