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

Unified Diff: setup/msi_test_utils.cc

Issue 624713003: Keep only base/extractor.[cc|h]. (Closed) Base URL: https://chromium.googlesource.com/external/omaha.git@master
Patch Set: Created 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « setup/msi_test_utils.h ('k') | setup/setup.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: setup/msi_test_utils.cc
diff --git a/setup/msi_test_utils.cc b/setup/msi_test_utils.cc
deleted file mode 100644
index 127d492787b1e8623de5509297e18d5b6ac4096e..0000000000000000000000000000000000000000
--- a/setup/msi_test_utils.cc
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2007-2009 Google Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// ========================================================================
-
-// IsMsiHelperInstalled requires MSI version 3.0 for MsiEnumProductsEx.
-// Omaha does not require MSI 3.0.
-#ifdef _WIN32_MSI
-#if (_WIN32_MSI < 300)
-#undef _WIN32_MSI
-#define _WIN32_MSI 300
-#endif
-#else
-#define _WIN32_MSI 300
-#endif
-
-#include <windows.h>
-#include <msi.h>
-#include "omaha/base/constants.h"
-#include "omaha/testing/unit_test.h"
-
-namespace omaha {
-
-bool IsMsiHelperInstalled() {
- int res = ::MsiEnumProductsEx(kHelperInstallerProductGuid,
- NULL,
- MSIINSTALLCONTEXT_MACHINE,
- 0,
- NULL,
- NULL,
- NULL,
- NULL);
-
- bool is_msi_installed = (ERROR_SUCCESS == res);
- EXPECT_TRUE(is_msi_installed || ERROR_NO_MORE_ITEMS == res);
-
- return is_msi_installed;
-}
-
-} // namespace omaha
« no previous file with comments | « setup/msi_test_utils.h ('k') | setup/setup.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698