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

Side by Side Diff: chrome/browser/extensions/menu_manager_unittest.cc

Issue 16295003: Update chrome/ to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 years, 6 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 | Annotate | Revision Log
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 <vector> 5 #include <vector>
6 6
7 #include "base/files/scoped_temp_dir.h" 7 #include "base/files/scoped_temp_dir.h"
8 #include "base/json/json_reader.h" 8 #include "base/json/json_reader.h"
9 #include "base/memory/scoped_vector.h" 9 #include "base/memory/scoped_vector.h"
10 #include "base/message_loop.h" 10 #include "base/message_loop.h"
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 MenuItem::Id id(false, extension->id()); 72 MenuItem::Id id(false, extension->id());
73 id.string_uid = string_id; 73 id.string_uid = string_id;
74 return new MenuItem(id, "test", false, true, type, contexts); 74 return new MenuItem(id, "test", false, true, type, contexts);
75 } 75 }
76 76
77 // Creates and returns a test Extension. The caller does *not* own the return 77 // Creates and returns a test Extension. The caller does *not* own the return
78 // value. 78 // value.
79 Extension* AddExtension(std::string name) { 79 Extension* AddExtension(std::string name) {
80 scoped_refptr<Extension> extension = prefs_.AddExtension(name); 80 scoped_refptr<Extension> extension = prefs_.AddExtension(name);
81 extensions_.push_back(extension); 81 extensions_.push_back(extension);
82 return extension; 82 return extension.get();
83 } 83 }
84 84
85 protected: 85 protected:
86 TestingProfile profile_; 86 TestingProfile profile_;
87 base::MessageLoopForUI message_loop_; 87 base::MessageLoopForUI message_loop_;
88 content::TestBrowserThread ui_thread_; 88 content::TestBrowserThread ui_thread_;
89 content::TestBrowserThread file_thread_; 89 content::TestBrowserThread file_thread_;
90 90
91 MenuManager manager_; 91 MenuManager manager_;
92 ExtensionList extensions_; 92 ExtensionList extensions_;
(...skipping 655 matching lines...) Expand 10 before | Expand all | Expand 10 after
748 EXPECT_EQ(4u, manager_.MenuItems(extension1->id())->size()); 748 EXPECT_EQ(4u, manager_.MenuItems(extension1->id())->size());
749 EXPECT_EQ(1u, manager_.MenuItems(extension2->id())->size()); 749 EXPECT_EQ(1u, manager_.MenuItems(extension2->id())->size());
750 750
751 // Remove all context menu items with incognito true. 751 // Remove all context menu items with incognito true.
752 manager_.RemoveAllIncognitoContextItems(); 752 manager_.RemoveAllIncognitoContextItems();
753 EXPECT_EQ(2u, manager_.MenuItems(extension1->id())->size()); 753 EXPECT_EQ(2u, manager_.MenuItems(extension1->id())->size());
754 EXPECT_EQ(1u, manager_.MenuItems(extension2->id())->size()); 754 EXPECT_EQ(1u, manager_.MenuItems(extension2->id())->size());
755 } 755 }
756 756
757 } // namespace extensions 757 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/extensions/installed_loader.cc ('k') | chrome/browser/extensions/page_action_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698