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

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

Issue 1557693002: Convert Pass()→std::move() in //chrome/browser/chromeos/policy (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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 "chrome/browser/chromeos/policy/device_local_account.h"
6
5 #include <stddef.h> 7 #include <stddef.h>
6
7 #include <map> 8 #include <map>
8 #include <set> 9 #include <set>
9 #include <string> 10 #include <string>
11 #include <utility>
10 #include <vector> 12 #include <vector>
11 13
12 #include "ash/shell.h" 14 #include "ash/shell.h"
13 #include "ash/system/chromeos/session/logout_confirmation_controller.h" 15 #include "ash/system/chromeos/session/logout_confirmation_controller.h"
14 #include "ash/system/chromeos/session/logout_confirmation_dialog.h" 16 #include "ash/system/chromeos/session/logout_confirmation_dialog.h"
15 #include "base/bind.h" 17 #include "base/bind.h"
16 #include "base/bind_helpers.h" 18 #include "base/bind_helpers.h"
17 #include "base/callback.h" 19 #include "base/callback.h"
18 #include "base/command_line.h" 20 #include "base/command_line.h"
19 #include "base/files/file_path.h" 21 #include "base/files/file_path.h"
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 #include "chrome/browser/chromeos/login/ui/login_display_host.h" 53 #include "chrome/browser/chromeos/login/ui/login_display_host.h"
52 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h" 54 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"
53 #include "chrome/browser/chromeos/login/ui/webui_login_view.h" 55 #include "chrome/browser/chromeos/login/ui/webui_login_view.h"
54 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager.h" 56 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager.h"
55 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.h" 57 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.h"
56 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager_test_uti l.h" 58 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager_test_uti l.h"
57 #include "chrome/browser/chromeos/login/users/chrome_user_manager_impl.h" 59 #include "chrome/browser/chromeos/login/users/chrome_user_manager_impl.h"
58 #include "chrome/browser/chromeos/login/wizard_controller.h" 60 #include "chrome/browser/chromeos/login/wizard_controller.h"
59 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" 61 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
60 #include "chrome/browser/chromeos/policy/cloud_external_data_manager_base_test_u til.h" 62 #include "chrome/browser/chromeos/policy/cloud_external_data_manager_base_test_u til.h"
61 #include "chrome/browser/chromeos/policy/device_local_account.h"
62 #include "chrome/browser/chromeos/policy/device_local_account_policy_service.h" 63 #include "chrome/browser/chromeos/policy/device_local_account_policy_service.h"
63 #include "chrome/browser/chromeos/policy/device_policy_builder.h" 64 #include "chrome/browser/chromeos/policy/device_policy_builder.h"
64 #include "chrome/browser/chromeos/policy/device_policy_cros_browser_test.h" 65 #include "chrome/browser/chromeos/policy/device_policy_cros_browser_test.h"
65 #include "chrome/browser/chromeos/policy/proto/chrome_device_policy.pb.h" 66 #include "chrome/browser/chromeos/policy/proto/chrome_device_policy.pb.h"
66 #include "chrome/browser/extensions/crx_installer.h" 67 #include "chrome/browser/extensions/crx_installer.h"
67 #include "chrome/browser/extensions/extension_service.h" 68 #include "chrome/browser/extensions/extension_service.h"
68 #include "chrome/browser/extensions/updater/chromeos_extension_cache_delegate.h" 69 #include "chrome/browser/extensions/updater/chromeos_extension_cache_delegate.h"
69 #include "chrome/browser/extensions/updater/extension_cache_impl.h" 70 #include "chrome/browser/extensions/updater/extension_cache_impl.h"
70 #include "chrome/browser/extensions/updater/local_extension_cache.h" 71 #include "chrome/browser/extensions/updater/local_extension_cache.h"
71 #include "chrome/browser/lifetime/application_lifetime.h" 72 #include "chrome/browser/lifetime/application_lifetime.h"
(...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after
330 entry->second.crx_url.spec().c_str(), 331 entry->second.crx_url.spec().c_str(),
331 entry->second.version.c_str()); 332 entry->second.version.c_str());
332 } 333 }
333 } 334 }
334 content += kUpdateManifestFooter; 335 content += kUpdateManifestFooter;
335 scoped_ptr<net::test_server::BasicHttpResponse> 336 scoped_ptr<net::test_server::BasicHttpResponse>
336 http_response(new net::test_server::BasicHttpResponse); 337 http_response(new net::test_server::BasicHttpResponse);
337 http_response->set_code(net::HTTP_OK); 338 http_response->set_code(net::HTTP_OK);
338 http_response->set_content(content); 339 http_response->set_content(content);
339 http_response->set_content_type("text/xml"); 340 http_response->set_content_type("text/xml");
340 return http_response.Pass(); 341 return std::move(http_response);
341 } 342 }
342 343
343 TestingUpdateManifestProvider::~TestingUpdateManifestProvider() { 344 TestingUpdateManifestProvider::~TestingUpdateManifestProvider() {
344 } 345 }
345 346
346 DictionaryPrefValueWaiter::DictionaryPrefValueWaiter( 347 DictionaryPrefValueWaiter::DictionaryPrefValueWaiter(
347 const std::string& pref, 348 const std::string& pref,
348 const std::string& key, 349 const std::string& key,
349 const std::string& expected_value) 350 const std::string& expected_value)
350 : pref_(pref), 351 : pref_(pref),
(...skipping 2085 matching lines...) Expand 10 before | Expand all | Expand 10 after
2436 ASSERT_TRUE(content::ExecuteScript(contents_, 2437 ASSERT_TRUE(content::ExecuteScript(contents_,
2437 "$('tos-accept-button').click();")); 2438 "$('tos-accept-button').click();"));
2438 2439
2439 WaitForSessionStart(); 2440 WaitForSessionStart();
2440 } 2441 }
2441 2442
2442 INSTANTIATE_TEST_CASE_P(TermsOfServiceDownloadTestInstance, 2443 INSTANTIATE_TEST_CASE_P(TermsOfServiceDownloadTestInstance,
2443 TermsOfServiceDownloadTest, testing::Bool()); 2444 TermsOfServiceDownloadTest, testing::Bool());
2444 2445
2445 } // namespace policy 2446 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698