OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/shell_integration.h" | 5 #include "chrome/browser/shell_integration.h" |
6 | 6 |
7 #include <map> | 7 #include <map> |
8 | 8 |
9 #include "base/file_path.h" | 9 #include "base/file_path.h" |
10 #include "base/file_util.h" | 10 #include "base/file_util.h" |
11 #include "base/message_loop.h" | 11 #include "base/message_loop.h" |
12 #include "base/scoped_temp_dir.h" | 12 #include "base/scoped_temp_dir.h" |
13 #include "base/stl_util-inl.h" | 13 #include "base/stl_util-inl.h" |
14 #include "base/string_util.h" | 14 #include "base/string_util.h" |
| 15 #include "base/utf_string_conversions.h" |
15 #include "chrome/browser/chrome_thread.h" | 16 #include "chrome/browser/chrome_thread.h" |
16 #include "chrome/common/chrome_constants.h" | 17 #include "chrome/common/chrome_constants.h" |
17 #include "chrome/common/chrome_paths_internal.h" | 18 #include "chrome/common/chrome_paths_internal.h" |
18 #include "googleurl/src/gurl.h" | 19 #include "googleurl/src/gurl.h" |
19 #include "testing/gtest/include/gtest/gtest.h" | 20 #include "testing/gtest/include/gtest/gtest.h" |
20 | 21 |
21 #if defined(OS_WIN) | 22 #if defined(OS_WIN) |
22 #include "chrome/installer/util/browser_distribution.h" | 23 #include "chrome/installer/util/browser_distribution.h" |
23 #elif defined(OS_LINUX) | 24 #elif defined(OS_LINUX) |
24 #include "base/env_var.h" | 25 #include "base/env_var.h" |
(...skipping 284 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
309 // Non-default profile path should get chrome::kBrowserAppID joined with | 310 // Non-default profile path should get chrome::kBrowserAppID joined with |
310 // profile info. | 311 // profile info. |
311 FilePath profile_path(FILE_PATH_LITERAL("root")); | 312 FilePath profile_path(FILE_PATH_LITERAL("root")); |
312 profile_path = profile_path.Append(FILE_PATH_LITERAL("udd")); | 313 profile_path = profile_path.Append(FILE_PATH_LITERAL("udd")); |
313 profile_path = profile_path.Append(FILE_PATH_LITERAL("User Data - Test")); | 314 profile_path = profile_path.Append(FILE_PATH_LITERAL("User Data - Test")); |
314 EXPECT_EQ(BrowserDistribution::GetDistribution()->GetBrowserAppId() + | 315 EXPECT_EQ(BrowserDistribution::GetDistribution()->GetBrowserAppId() + |
315 L".udd.UserDataTest", | 316 L".udd.UserDataTest", |
316 ShellIntegration::GetChromiumAppId(profile_path)); | 317 ShellIntegration::GetChromiumAppId(profile_path)); |
317 } | 318 } |
318 #endif | 319 #endif |
OLD | NEW |