| OLD | NEW |
| 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/installer/util/product.h" | 5 #include "chrome/installer/util/product.h" |
| 6 | 6 |
| 7 #include <memory> | 7 #include <memory> |
| 8 | 8 |
| 9 #include "base/files/file_path.h" | 9 #include "base/files/file_path.h" |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| 11 #include "base/memory/ptr_util.h" | 11 #include "base/memory/ptr_util.h" |
| 12 #include "base/path_service.h" | 12 #include "base/path_service.h" |
| 13 #include "base/strings/utf_string_conversions.h" | 13 #include "base/strings/utf_string_conversions.h" |
| 14 #include "base/test/test_reg_util_win.h" | 14 #include "base/test/test_reg_util_win.h" |
| 15 #include "chrome/common/chrome_paths.h" | 15 #include "chrome/common/chrome_paths.h" |
| 16 #include "chrome/installer/util/chrome_frame_distribution.h" | |
| 17 #include "chrome/installer/util/google_update_constants.h" | 16 #include "chrome/installer/util/google_update_constants.h" |
| 18 #include "chrome/installer/util/installation_state.h" | 17 #include "chrome/installer/util/installation_state.h" |
| 19 #include "chrome/installer/util/master_preferences.h" | 18 #include "chrome/installer/util/master_preferences.h" |
| 20 #include "testing/gtest/include/gtest/gtest.h" | 19 #include "testing/gtest/include/gtest/gtest.h" |
| 21 | 20 |
| 22 using base::win::RegKey; | 21 using base::win::RegKey; |
| 23 using installer::Product; | 22 using installer::Product; |
| 24 using installer::MasterPreferences; | 23 using installer::MasterPreferences; |
| 25 using registry_util::RegistryOverrideManager; | 24 using registry_util::RegistryOverrideManager; |
| 26 | 25 |
| (...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 98 if (chrome_state) | 97 if (chrome_state) |
| 99 EXPECT_TRUE(chrome_state->is_msi()); | 98 EXPECT_TRUE(chrome_state->is_msi()); |
| 100 } | 99 } |
| 101 } | 100 } |
| 102 | 101 |
| 103 TEST(ProductTest, LaunchChrome) { | 102 TEST(ProductTest, LaunchChrome) { |
| 104 // TODO(tommi): Test Product::LaunchChrome and | 103 // TODO(tommi): Test Product::LaunchChrome and |
| 105 // Product::LaunchChromeAndWait. | 104 // Product::LaunchChromeAndWait. |
| 106 NOTIMPLEMENTED(); | 105 NOTIMPLEMENTED(); |
| 107 } | 106 } |
| OLD | NEW |