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

Side by Side Diff: chrome/browser/ui/app_list/extension_app_model_builder_unittest.cc

Issue 1865213004: Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "chrome/browser/ui/app_list/extension_app_model_builder.h" 5 #include "chrome/browser/ui/app_list/extension_app_model_builder.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <memory>
9 #include <string> 10 #include <string>
10 11
11 #include "base/files/file_path.h" 12 #include "base/files/file_path.h"
12 #include "base/macros.h" 13 #include "base/macros.h"
13 #include "base/memory/scoped_ptr.h"
14 #include "base/run_loop.h" 14 #include "base/run_loop.h"
15 #include "base/values.h" 15 #include "base/values.h"
16 #include "chrome/browser/extensions/extension_function_test_utils.h" 16 #include "chrome/browser/extensions/extension_function_test_utils.h"
17 #include "chrome/browser/extensions/extension_service.h" 17 #include "chrome/browser/extensions/extension_service.h"
18 #include "chrome/browser/extensions/install_tracker.h" 18 #include "chrome/browser/extensions/install_tracker.h"
19 #include "chrome/browser/extensions/install_tracker_factory.h" 19 #include "chrome/browser/extensions/install_tracker_factory.h"
20 #include "chrome/browser/ui/app_list/app_list_test_util.h" 20 #include "chrome/browser/ui/app_list/app_list_test_util.h"
21 #include "chrome/browser/ui/app_list/test/test_app_list_controller_delegate.h" 21 #include "chrome/browser/ui/app_list/test/test_app_list_controller_delegate.h"
22 #include "chrome/common/chrome_constants.h" 22 #include "chrome/common/chrome_constants.h"
23 #include "chrome/common/extensions/extension_constants.h" 23 #include "chrome/common/extensions/extension_constants.h"
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 builder_.reset(new ExtensionAppModelBuilder(controller_.get())); 100 builder_.reset(new ExtensionAppModelBuilder(controller_.get()));
101 builder_->InitializeWithProfile(profile_.get(), model_.get()); 101 builder_->InitializeWithProfile(profile_.get(), model_.get());
102 } 102 }
103 103
104 void ResetBuilder() { 104 void ResetBuilder() {
105 builder_.reset(); 105 builder_.reset();
106 controller_.reset(); 106 controller_.reset();
107 model_.reset(); 107 model_.reset();
108 } 108 }
109 109
110 scoped_ptr<app_list::AppListModel> model_; 110 std::unique_ptr<app_list::AppListModel> model_;
111 scoped_ptr<test::TestAppListControllerDelegate> controller_; 111 std::unique_ptr<test::TestAppListControllerDelegate> controller_;
112 scoped_ptr<ExtensionAppModelBuilder> builder_; 112 std::unique_ptr<ExtensionAppModelBuilder> builder_;
113 113
114 base::ScopedTempDir second_profile_temp_dir_; 114 base::ScopedTempDir second_profile_temp_dir_;
115 115
116 private: 116 private:
117 DISALLOW_COPY_AND_ASSIGN(ExtensionAppModelBuilderTest); 117 DISALLOW_COPY_AND_ASSIGN(ExtensionAppModelBuilderTest);
118 }; 118 };
119 119
120 TEST_F(ExtensionAppModelBuilderTest, Build) { 120 TEST_F(ExtensionAppModelBuilderTest, Build) {
121 // The apps list would have 3 extension apps in the profile. 121 // The apps list would have 3 extension apps in the profile.
122 EXPECT_EQ(kDefaultAppCount, model_->top_level_item_list()->item_count()); 122 EXPECT_EQ(kDefaultAppCount, model_->top_level_item_list()->item_count());
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after
322 extensions::Extension::WAS_INSTALLED_BY_DEFAULT | 322 extensions::Extension::WAS_INSTALLED_BY_DEFAULT |
323 extensions::Extension::FROM_BOOKMARK, 323 extensions::Extension::FROM_BOOKMARK,
324 kAppId, 324 kAppId,
325 &err); 325 &err);
326 EXPECT_TRUE(err.empty()); 326 EXPECT_TRUE(err.empty());
327 327
328 service_->AddExtension(bookmark_app.get()); 328 service_->AddExtension(bookmark_app.get());
329 EXPECT_EQ(kDefaultAppCount + 1, model_->top_level_item_list()->item_count()); 329 EXPECT_EQ(kDefaultAppCount + 1, model_->top_level_item_list()->item_count());
330 EXPECT_NE(std::string::npos, GetModelContent(model_.get()).find(kAppName)); 330 EXPECT_NE(std::string::npos, GetModelContent(model_.get()).find(kAppName));
331 } 331 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/app_list/extension_app_model_builder.cc ('k') | chrome/browser/ui/app_list/extension_uninstaller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698