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

Side by Side Diff: chrome/browser/policy/cloud/cloud_policy_browsertest.cc

Issue 444903002: [cros] user_manager component - move UserManagerBase and UserManager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 4 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 "base/callback.h" 5 #include "base/callback.h"
6 #include "base/command_line.h" 6 #include "base/command_line.h"
7 #include "base/file_util.h" 7 #include "base/file_util.h"
8 #include "base/files/file_path.h" 8 #include "base/files/file_path.h"
9 #include "base/files/scoped_temp_dir.h" 9 #include "base/files/scoped_temp_dir.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 30 matching lines...) Expand all
41 #include "content/public/test/test_utils.h" 41 #include "content/public/test/test_utils.h"
42 #include "net/url_request/url_request_context_getter.h" 42 #include "net/url_request/url_request_context_getter.h"
43 #include "policy/policy_constants.h" 43 #include "policy/policy_constants.h"
44 #include "policy/proto/chrome_settings.pb.h" 44 #include "policy/proto/chrome_settings.pb.h"
45 #include "policy/proto/cloud_policy.pb.h" 45 #include "policy/proto/cloud_policy.pb.h"
46 #include "testing/gmock/include/gmock/gmock.h" 46 #include "testing/gmock/include/gmock/gmock.h"
47 #include "testing/gtest/include/gtest/gtest.h" 47 #include "testing/gtest/include/gtest/gtest.h"
48 #include "url/gurl.h" 48 #include "url/gurl.h"
49 49
50 #if defined(OS_CHROMEOS) 50 #if defined(OS_CHROMEOS)
51 #include "chrome/browser/chromeos/login/users/user_manager.h"
52 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h" 51 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h"
53 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chrom eos.h" 52 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chrom eos.h"
54 #include "chromeos/chromeos_paths.h" 53 #include "chromeos/chromeos_paths.h"
55 #include "chromeos/dbus/cryptohome_client.h" 54 #include "chromeos/dbus/cryptohome_client.h"
56 #include "chromeos/login/user_names.h" 55 #include "chromeos/login/user_names.h"
57 #else 56 #else
58 #include "chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h" 57 #include "chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h"
59 #include "chrome/browser/signin/signin_manager_factory.h" 58 #include "chrome/browser/signin/signin_manager_factory.h"
60 #include "components/policy/core/common/cloud/user_cloud_policy_manager.h" 59 #include "components/policy/core/common/cloud/user_cloud_policy_manager.h"
61 #include "components/signin/core/browser/signin_manager.h" 60 #include "components/signin/core/browser/signin_manager.h"
(...skipping 411 matching lines...) Expand 10 before | Expand all | Expand 10 after
473 472
474 // They should now serialize to the same bytes. 473 // They should now serialize to the same bytes.
475 std::string chrome_settings_serialized; 474 std::string chrome_settings_serialized;
476 std::string cloud_policy_serialized; 475 std::string cloud_policy_serialized;
477 ASSERT_TRUE(chrome_settings.SerializeToString(&chrome_settings_serialized)); 476 ASSERT_TRUE(chrome_settings.SerializeToString(&chrome_settings_serialized));
478 ASSERT_TRUE(cloud_policy.SerializeToString(&cloud_policy_serialized)); 477 ASSERT_TRUE(cloud_policy.SerializeToString(&cloud_policy_serialized));
479 EXPECT_EQ(chrome_settings_serialized, cloud_policy_serialized); 478 EXPECT_EQ(chrome_settings_serialized, cloud_policy_serialized);
480 } 479 }
481 480
482 } // namespace policy 481 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698