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

Side by Side Diff: chrome/browser/google/google_update_win_unittest.cc

Issue 1411173003: Revert of Cleanup chrome/version.h handling (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/google/google_update_win.h" 5 #include "chrome/browser/google/google_update_win.h"
6 6
7 #include <windows.h> 7 #include <windows.h>
8 #include <atlbase.h> 8 #include <atlbase.h>
9 #include <atlcom.h> 9 #include <atlcom.h>
10 10
11 #include <queue> 11 #include <queue>
12 12
13 #include "base/base_paths.h" 13 #include "base/base_paths.h"
14 #include "base/memory/ref_counted.h" 14 #include "base/memory/ref_counted.h"
15 #include "base/path_service.h" 15 #include "base/path_service.h"
16 #include "base/strings/stringprintf.h" 16 #include "base/strings/stringprintf.h"
17 #include "base/strings/utf_string_conversions.h" 17 #include "base/strings/utf_string_conversions.h"
18 #include "base/test/scoped_path_override.h" 18 #include "base/test/scoped_path_override.h"
19 #include "base/test/test_reg_util_win.h" 19 #include "base/test/test_reg_util_win.h"
20 #include "base/test/test_simple_task_runner.h" 20 #include "base/test/test_simple_task_runner.h"
21 #include "base/thread_task_runner_handle.h" 21 #include "base/thread_task_runner_handle.h"
22 #include "base/version.h" 22 #include "base/version.h"
23 #include "base/win/registry.h" 23 #include "base/win/registry.h"
24 #include "base/win/scoped_comptr.h" 24 #include "base/win/scoped_comptr.h"
25 #include "chrome/common/chrome_version.h"
26 #include "chrome/installer/util/browser_distribution.h" 25 #include "chrome/installer/util/browser_distribution.h"
27 #include "chrome/installer/util/google_update_settings.h" 26 #include "chrome/installer/util/google_update_settings.h"
28 #include "chrome/installer/util/helper.h" 27 #include "chrome/installer/util/helper.h"
29 #include "google_update/google_update_idl.h" 28 #include "google_update/google_update_idl.h"
30 #include "testing/gmock/include/gmock/gmock.h" 29 #include "testing/gmock/include/gmock/gmock.h"
31 #include "testing/gtest/include/gtest/gtest.h" 30 #include "testing/gtest/include/gtest/gtest.h"
32 #include "ui/base/win/atl_module.h" 31 #include "ui/base/win/atl_module.h"
32 #include "version.h"
33 33
34 using ::testing::DoAll; 34 using ::testing::DoAll;
35 using ::testing::HasSubstr; 35 using ::testing::HasSubstr;
36 using ::testing::InSequence; 36 using ::testing::InSequence;
37 using ::testing::IsEmpty; 37 using ::testing::IsEmpty;
38 using ::testing::Return; 38 using ::testing::Return;
39 using ::testing::Sequence; 39 using ::testing::Sequence;
40 using ::testing::SetArgPointee; 40 using ::testing::SetArgPointee;
41 using ::testing::StrEq; 41 using ::testing::StrEq;
42 using ::testing::StrictMock; 42 using ::testing::StrictMock;
(...skipping 967 matching lines...) Expand 10 before | Expand all | Expand 10 after
1010 BeginUpdateCheck(task_runner_, std::string(), true, 0, 1010 BeginUpdateCheck(task_runner_, std::string(), true, 0,
1011 mock_update_check_delegate_.AsWeakPtr()); 1011 mock_update_check_delegate_.AsWeakPtr());
1012 BeginUpdateCheck(task_runner_, std::string(), true, 0, 1012 BeginUpdateCheck(task_runner_, std::string(), true, 0,
1013 mock_update_check_delegate_2.AsWeakPtr()); 1013 mock_update_check_delegate_2.AsWeakPtr());
1014 task_runner_->RunUntilIdle(); 1014 task_runner_->RunUntilIdle();
1015 } 1015 }
1016 1016
1017 INSTANTIATE_TEST_CASE_P(UserLevel, GoogleUpdateWinTest, Values(false)); 1017 INSTANTIATE_TEST_CASE_P(UserLevel, GoogleUpdateWinTest, Values(false));
1018 1018
1019 INSTANTIATE_TEST_CASE_P(SystemLevel, GoogleUpdateWinTest, Values(true)); 1019 INSTANTIATE_TEST_CASE_P(SystemLevel, GoogleUpdateWinTest, Values(true));
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698