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

Side by Side Diff: chrome/browser/chromeos/policy/device_local_account_browsertest.cc

Issue 640353003: Use scoped_ptr::Pass instead of scoped_ptr::PassAs<T>. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix typo Created 6 years, 2 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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 <map> 5 #include <map>
6 #include <set> 6 #include <set>
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "ash/shell.h" 10 #include "ash/shell.h"
(...skipping 296 matching lines...) Expand 10 before | Expand all | Expand 10 after
307 entry->second.crx_url.spec().c_str(), 307 entry->second.crx_url.spec().c_str(),
308 entry->second.version.c_str()); 308 entry->second.version.c_str());
309 } 309 }
310 } 310 }
311 content += kUpdateManifestFooter; 311 content += kUpdateManifestFooter;
312 scoped_ptr<net::test_server::BasicHttpResponse> 312 scoped_ptr<net::test_server::BasicHttpResponse>
313 http_response(new net::test_server::BasicHttpResponse); 313 http_response(new net::test_server::BasicHttpResponse);
314 http_response->set_code(net::HTTP_OK); 314 http_response->set_code(net::HTTP_OK);
315 http_response->set_content(content); 315 http_response->set_content(content);
316 http_response->set_content_type("text/xml"); 316 http_response->set_content_type("text/xml");
317 return http_response.PassAs<net::test_server::HttpResponse>(); 317 return http_response.Pass();
318 } 318 }
319 319
320 DictionaryPrefValueWaiter::DictionaryPrefValueWaiter( 320 DictionaryPrefValueWaiter::DictionaryPrefValueWaiter(
321 const std::string& pref, 321 const std::string& pref,
322 const std::string& key, 322 const std::string& key,
323 const std::string& expected_value) 323 const std::string& expected_value)
324 : pref_(pref), 324 : pref_(pref),
325 key_(key), 325 key_(key),
326 expected_value_(expected_value) { 326 expected_value_(expected_value) {
327 pref_change_registrar_.Init(g_browser_process->local_state()); 327 pref_change_registrar_.Init(g_browser_process->local_state());
(...skipping 1756 matching lines...) Expand 10 before | Expand all | Expand 10 after
2084 ASSERT_TRUE(content::ExecuteScript(contents_, 2084 ASSERT_TRUE(content::ExecuteScript(contents_,
2085 "$('tos-accept-button').click();")); 2085 "$('tos-accept-button').click();"));
2086 2086
2087 WaitForSessionStart(); 2087 WaitForSessionStart();
2088 } 2088 }
2089 2089
2090 INSTANTIATE_TEST_CASE_P(TermsOfServiceDownloadTestInstance, 2090 INSTANTIATE_TEST_CASE_P(TermsOfServiceDownloadTestInstance,
2091 TermsOfServiceDownloadTest, testing::Bool()); 2091 TermsOfServiceDownloadTest, testing::Bool());
2092 2092
2093 } // namespace policy 2093 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698