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

Side by Side Diff: chrome/browser/shell_integration_win_unittest.cc

Issue 486843004: Change base/file_utils.h includes to base/files/file_utils.h in chrome/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix bad merge Created 6 years, 3 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 "chrome/browser/shell_integration.h" 5 #include "chrome/browser/shell_integration.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/file_util.h"
10 #include "base/files/file_path.h" 9 #include "base/files/file_path.h"
10 #include "base/files/file_util.h"
11 #include "base/files/scoped_temp_dir.h" 11 #include "base/files/scoped_temp_dir.h"
12 #include "base/strings/string16.h" 12 #include "base/strings/string16.h"
13 #include "base/strings/string_number_conversions.h" 13 #include "base/strings/string_number_conversions.h"
14 #include "base/strings/utf_string_conversions.h" 14 #include "base/strings/utf_string_conversions.h"
15 #include "base/test/test_shortcut_win.h" 15 #include "base/test/test_shortcut_win.h"
16 #include "base/win/scoped_com_initializer.h" 16 #include "base/win/scoped_com_initializer.h"
17 #include "base/win/windows_version.h" 17 #include "base/win/windows_version.h"
18 #include "chrome/browser/web_applications/web_app.h" 18 #include "chrome/browser/web_applications/web_app.h"
19 #include "chrome/common/chrome_constants.h" 19 #include "chrome/common/chrome_constants.h"
20 #include "chrome/common/chrome_paths_internal.h" 20 #include "chrome/common/chrome_paths_internal.h"
(...skipping 346 matching lines...) Expand 10 before | Expand all | Expand 10 after
367 default_profile_path)); 367 default_profile_path));
368 368
369 // Non-default profile path should get chrome::kBrowserAppID + AppList joined 369 // Non-default profile path should get chrome::kBrowserAppID + AppList joined
370 // with profile info. 370 // with profile info.
371 base::FilePath profile_path(FILE_PATH_LITERAL("root")); 371 base::FilePath profile_path(FILE_PATH_LITERAL("root"));
372 profile_path = profile_path.Append(FILE_PATH_LITERAL("udd")); 372 profile_path = profile_path.Append(FILE_PATH_LITERAL("udd"));
373 profile_path = profile_path.Append(FILE_PATH_LITERAL("User Data - Test")); 373 profile_path = profile_path.Append(FILE_PATH_LITERAL("User Data - Test"));
374 EXPECT_EQ(base_app_id + L".udd.UserDataTest", 374 EXPECT_EQ(base_app_id + L".udd.UserDataTest",
375 ShellIntegration::GetAppListAppModelIdForProfile(profile_path)); 375 ShellIntegration::GetAppListAppModelIdForProfile(profile_path));
376 } 376 }
OLDNEW
« no previous file with comments | « chrome/browser/shell_integration_win.cc ('k') | chrome/browser/spellchecker/spellcheck_custom_dictionary.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698