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

Side by Side Diff: chrome/browser/ui/webui/media_router/media_router_ui_unittest.cc

Issue 1511103003: Use rvalue reference instead of ExtensionBuilder::pass() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "base/bind.h" 5 #include "base/bind.h"
6 #include "chrome/browser/media/router/media_route.h" 6 #include "chrome/browser/media/router/media_route.h"
7 #include "chrome/browser/media/router/mock_media_router.h" 7 #include "chrome/browser/media/router/mock_media_router.h"
8 #include "chrome/browser/ui/webui/media_router/media_router_ui.h" 8 #include "chrome/browser/ui/webui/media_router/media_router_ui.h"
9 #include "extensions/browser/extension_registry.h" 9 #include "extensions/browser/extension_registry.h"
10 #include "extensions/common/extension.h" 10 #include "extensions/common/extension.h"
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 EXPECT_CALL(mock_router, UnregisterMediaRoutesObserver(_)).Times(1); 59 EXPECT_CALL(mock_router, UnregisterMediaRoutesObserver(_)).Times(1);
60 observer.reset(); 60 observer.reset();
61 } 61 }
62 62
63 TEST_F(MediaRouterUITest, GetExtensionNameExtensionPresent) { 63 TEST_F(MediaRouterUITest, GetExtensionNameExtensionPresent) {
64 std::string id = "extensionid"; 64 std::string id = "extensionid";
65 GURL url = GURL("chrome-extension://" + id); 65 GURL url = GURL("chrome-extension://" + id);
66 scoped_ptr<extensions::ExtensionRegistry> registry = 66 scoped_ptr<extensions::ExtensionRegistry> registry =
67 make_scoped_ptr(new extensions::ExtensionRegistry(nullptr)); 67 make_scoped_ptr(new extensions::ExtensionRegistry(nullptr));
68 scoped_refptr<extensions::Extension> app = 68 scoped_refptr<extensions::Extension> app =
69 extensions::test_util::BuildApp(extensions::ExtensionBuilder().Pass()) 69 extensions::test_util::BuildApp(extensions::ExtensionBuilder())
70 .MergeManifest( 70 .MergeManifest(
71 extensions::DictionaryBuilder().Set("name", "test app name")) 71 extensions::DictionaryBuilder().Set("name", "test app name"))
72 .SetID(id) 72 .SetID(id)
73 .Build(); 73 .Build();
74 74
75 ASSERT_TRUE(registry->AddEnabled(app)); 75 ASSERT_TRUE(registry->AddEnabled(app));
76 EXPECT_EQ("test app name", 76 EXPECT_EQ("test app name",
77 MediaRouterUI::GetExtensionName(url, registry.get())); 77 MediaRouterUI::GetExtensionName(url, registry.get()));
78 } 78 }
79 79
80 TEST_F(MediaRouterUITest, GetExtensionNameEmptyWhenNotInstalled) { 80 TEST_F(MediaRouterUITest, GetExtensionNameEmptyWhenNotInstalled) {
81 std::string id = "extensionid"; 81 std::string id = "extensionid";
82 GURL url = GURL("chrome-extension://" + id); 82 GURL url = GURL("chrome-extension://" + id);
83 scoped_ptr<extensions::ExtensionRegistry> registry = 83 scoped_ptr<extensions::ExtensionRegistry> registry =
84 make_scoped_ptr(new extensions::ExtensionRegistry(nullptr)); 84 make_scoped_ptr(new extensions::ExtensionRegistry(nullptr));
85 85
86 EXPECT_EQ("", MediaRouterUI::GetExtensionName(url, registry.get())); 86 EXPECT_EQ("", MediaRouterUI::GetExtensionName(url, registry.get()));
87 } 87 }
88 88
89 TEST_F(MediaRouterUITest, GetExtensionNameEmptyWhenNotExtensionURL) { 89 TEST_F(MediaRouterUITest, GetExtensionNameEmptyWhenNotExtensionURL) {
90 GURL url = GURL("https://www.google.com"); 90 GURL url = GURL("https://www.google.com");
91 scoped_ptr<extensions::ExtensionRegistry> registry = 91 scoped_ptr<extensions::ExtensionRegistry> registry =
92 make_scoped_ptr(new extensions::ExtensionRegistry(nullptr)); 92 make_scoped_ptr(new extensions::ExtensionRegistry(nullptr));
93 93
94 EXPECT_EQ("", MediaRouterUI::GetExtensionName(url, registry.get())); 94 EXPECT_EQ("", MediaRouterUI::GetExtensionName(url, registry.get()));
95 } 95 }
96 } // namespace media_router 96 } // namespace media_router
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698