| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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.h" |
| 14 #include "base/string_util.h" | 14 #include "base/string_util.h" |
| 15 #include "base/utf_string_conversions.h" | 15 #include "base/utf_string_conversions.h" |
| 16 #include "chrome/browser/web_applications/web_app.h" | 16 #include "chrome/browser/web_applications/web_app.h" |
| 17 #include "chrome/common/chrome_constants.h" | 17 #include "chrome/common/chrome_constants.h" |
| 18 #include "chrome/common/chrome_paths_internal.h" | 18 #include "chrome/common/chrome_paths_internal.h" |
| 19 #include "content/browser/browser_thread.h" | 19 #include "content/browser/browser_thread.h" |
| 20 #include "googleurl/src/gurl.h" | 20 #include "googleurl/src/gurl.h" |
| 21 #include "testing/gtest/include/gtest/gtest.h" | 21 #include "testing/gtest/include/gtest/gtest.h" |
| 22 | 22 |
| 23 #if defined(OS_WIN) | 23 #if defined(OS_WIN) |
| (...skipping 325 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 349 // Non-default profile path should get chrome::kBrowserAppID joined with | 349 // Non-default profile path should get chrome::kBrowserAppID joined with |
| 350 // profile info. | 350 // profile info. |
| 351 FilePath profile_path(FILE_PATH_LITERAL("root")); | 351 FilePath profile_path(FILE_PATH_LITERAL("root")); |
| 352 profile_path = profile_path.Append(FILE_PATH_LITERAL("udd")); | 352 profile_path = profile_path.Append(FILE_PATH_LITERAL("udd")); |
| 353 profile_path = profile_path.Append(FILE_PATH_LITERAL("User Data - Test")); | 353 profile_path = profile_path.Append(FILE_PATH_LITERAL("User Data - Test")); |
| 354 EXPECT_EQ(BrowserDistribution::GetDistribution()->GetBrowserAppId() + | 354 EXPECT_EQ(BrowserDistribution::GetDistribution()->GetBrowserAppId() + |
| 355 L".udd.UserDataTest", | 355 L".udd.UserDataTest", |
| 356 ShellIntegration::GetChromiumAppId(profile_path)); | 356 ShellIntegration::GetChromiumAppId(profile_path)); |
| 357 } | 357 } |
| 358 #endif | 358 #endif |
| OLD | NEW |