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

Side by Side Diff: chrome/installer/util/install_util_unittest.cc

Issue 16421004: Use a direct include of strings headers in chrome/installer/, part 2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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
« no previous file with comments | « chrome/installer/util/install_util.cc ('k') | chrome/installer/util/installation_state.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 <string> 5 #include <string>
6 #include <utility> 6 #include <utility>
7 7
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/file_util.h" 9 #include "base/file_util.h"
10 #include "base/string_util.h" 10 #include "base/strings/string_util.h"
11 #include "base/test/test_reg_util_win.h" 11 #include "base/test/test_reg_util_win.h"
12 #include "base/win/registry.h" 12 #include "base/win/registry.h"
13 #include "chrome/installer/util/google_update_constants.h" 13 #include "chrome/installer/util/google_update_constants.h"
14 #include "chrome/installer/util/install_util.h" 14 #include "chrome/installer/util/install_util.h"
15 #include "chrome/installer/util/product_unittest.h" 15 #include "chrome/installer/util/product_unittest.h"
16 #include "testing/gmock/include/gmock/gmock.h" 16 #include "testing/gmock/include/gmock/gmock.h"
17 17
18 using base::win::RegKey; 18 using base::win::RegKey;
19 using registry_util::RegistryOverrideManager; 19 using registry_util::RegistryOverrideManager;
20 using ::testing::_; 20 using ::testing::_;
(...skipping 413 matching lines...) Expand 10 before | Expand all | Expand 10 after
434 WriteInto(&short_expect, MAX_PATH), 434 WriteInto(&short_expect, MAX_PATH),
435 MAX_PATH); 435 MAX_PATH);
436 ASSERT_NE(static_cast<DWORD>(0), short_len); 436 ASSERT_NE(static_cast<DWORD>(0), short_len);
437 ASSERT_GT(static_cast<DWORD>(MAX_PATH), short_len); 437 ASSERT_GT(static_cast<DWORD>(MAX_PATH), short_len);
438 short_expect.resize(short_len); 438 short_expect.resize(short_len);
439 ASSERT_FALSE(base::FilePath::CompareEqualIgnoreCase(expect.value(), 439 ASSERT_FALSE(base::FilePath::CompareEqualIgnoreCase(expect.value(),
440 short_expect)); 440 short_expect));
441 EXPECT_TRUE(InstallUtil::ProgramCompare(expect).Evaluate( 441 EXPECT_TRUE(InstallUtil::ProgramCompare(expect).Evaluate(
442 L"\"" + short_expect + L"\"")); 442 L"\"" + short_expect + L"\""));
443 } 443 }
OLDNEW
« no previous file with comments | « chrome/installer/util/install_util.cc ('k') | chrome/installer/util/installation_state.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698