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

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: nit change(dana review) 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 "chrome/test/base/testing_profile.h" 9 #include "chrome/test/base/testing_profile.h"
10 #include "content/public/test/test_browser_thread_bundle.h" 10 #include "content/public/test/test_browser_thread_bundle.h"
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 EXPECT_CALL(mock_router, UnregisterMediaRoutesObserver(_)).Times(1); 108 EXPECT_CALL(mock_router, UnregisterMediaRoutesObserver(_)).Times(1);
109 observer.reset(); 109 observer.reset();
110 } 110 }
111 111
112 TEST_F(MediaRouterUITest, GetExtensionNameExtensionPresent) { 112 TEST_F(MediaRouterUITest, GetExtensionNameExtensionPresent) {
113 std::string id = "extensionid"; 113 std::string id = "extensionid";
114 GURL url = GURL("chrome-extension://" + id); 114 GURL url = GURL("chrome-extension://" + id);
115 scoped_ptr<extensions::ExtensionRegistry> registry = 115 scoped_ptr<extensions::ExtensionRegistry> registry =
116 make_scoped_ptr(new extensions::ExtensionRegistry(nullptr)); 116 make_scoped_ptr(new extensions::ExtensionRegistry(nullptr));
117 scoped_refptr<extensions::Extension> app = 117 scoped_refptr<extensions::Extension> app =
118 extensions::test_util::BuildApp(extensions::ExtensionBuilder().Pass()) 118 extensions::test_util::BuildApp(extensions::ExtensionBuilder())
119 .MergeManifest( 119 .MergeManifest(
120 extensions::DictionaryBuilder().Set("name", "test app name")) 120 extensions::DictionaryBuilder().Set("name", "test app name"))
121 .SetID(id) 121 .SetID(id)
122 .Build(); 122 .Build();
123 123
124 ASSERT_TRUE(registry->AddEnabled(app)); 124 ASSERT_TRUE(registry->AddEnabled(app));
125 EXPECT_EQ("test app name", 125 EXPECT_EQ("test app name",
126 MediaRouterUI::GetExtensionName(url, registry.get())); 126 MediaRouterUI::GetExtensionName(url, registry.get()));
127 } 127 }
128 128
129 TEST_F(MediaRouterUITest, GetExtensionNameEmptyWhenNotInstalled) { 129 TEST_F(MediaRouterUITest, GetExtensionNameEmptyWhenNotInstalled) {
130 std::string id = "extensionid"; 130 std::string id = "extensionid";
131 GURL url = GURL("chrome-extension://" + id); 131 GURL url = GURL("chrome-extension://" + id);
132 scoped_ptr<extensions::ExtensionRegistry> registry = 132 scoped_ptr<extensions::ExtensionRegistry> registry =
133 make_scoped_ptr(new extensions::ExtensionRegistry(nullptr)); 133 make_scoped_ptr(new extensions::ExtensionRegistry(nullptr));
134 134
135 EXPECT_EQ("", MediaRouterUI::GetExtensionName(url, registry.get())); 135 EXPECT_EQ("", MediaRouterUI::GetExtensionName(url, registry.get()));
136 } 136 }
137 137
138 TEST_F(MediaRouterUITest, GetExtensionNameEmptyWhenNotExtensionURL) { 138 TEST_F(MediaRouterUITest, GetExtensionNameEmptyWhenNotExtensionURL) {
139 GURL url = GURL("https://www.google.com"); 139 GURL url = GURL("https://www.google.com");
140 scoped_ptr<extensions::ExtensionRegistry> registry = 140 scoped_ptr<extensions::ExtensionRegistry> registry =
141 make_scoped_ptr(new extensions::ExtensionRegistry(nullptr)); 141 make_scoped_ptr(new extensions::ExtensionRegistry(nullptr));
142 142
143 EXPECT_EQ("", MediaRouterUI::GetExtensionName(url, registry.get())); 143 EXPECT_EQ("", MediaRouterUI::GetExtensionName(url, registry.get()));
144 } 144 }
145 } // namespace media_router 145 } // namespace media_router
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698