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