OLD | NEW |
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 <string> | 5 #include <string> |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/message_loop/message_loop.h" | 8 #include "base/message_loop/message_loop.h" |
9 #include "base/run_loop.h" | 9 #include "base/run_loop.h" |
10 #include "base/sys_info.h" | 10 #include "base/sys_info.h" |
11 #include "build/build_config.h" | 11 #include "build/build_config.h" |
12 #include "sync/util/get_session_name.h" | 12 #include "components/sync/base/get_session_name.h" |
13 #include "testing/gtest/include/gtest/gtest.h" | 13 #include "testing/gtest/include/gtest/gtest.h" |
14 | 14 |
15 #if defined(OS_CHROMEOS) | 15 #if defined(OS_CHROMEOS) |
16 #include "base/command_line.h" | 16 #include "base/command_line.h" |
17 #include "chromeos/chromeos_switches.h" | 17 #include "chromeos/chromeos_switches.h" |
18 #endif // OS_CHROMEOS | 18 #endif // OS_CHROMEOS |
19 | 19 |
20 namespace syncer { | 20 namespace syncer { |
21 | 21 |
22 namespace { | 22 namespace { |
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
69 GetSessionName(message_loop_.task_runner(), | 69 GetSessionName(message_loop_.task_runner(), |
70 base::Bind(&GetSessionNameTest::SetSessionNameAndQuit, | 70 base::Bind(&GetSessionNameTest::SetSessionNameAndQuit, |
71 base::Unretained(this))); | 71 base::Unretained(this))); |
72 base::RunLoop().Run(); | 72 base::RunLoop().Run(); |
73 EXPECT_EQ(session_name_, GetSessionNameSynchronouslyForTesting()); | 73 EXPECT_EQ(session_name_, GetSessionNameSynchronouslyForTesting()); |
74 } | 74 } |
75 | 75 |
76 } // namespace | 76 } // namespace |
77 | 77 |
78 } // namespace syncer | 78 } // namespace syncer |
OLD | NEW |