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

Unified Diff: apps/app_shim/app_shim_host_manager_browsertest_mac.mm

Issue 501303002: [Mac] Make app shims load the same framework version as the running Chrome process. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add a comment. Created 6 years, 4 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
Index: apps/app_shim/app_shim_host_manager_browsertest_mac.mm
diff --git a/apps/app_shim/app_shim_host_manager_browsertest_mac.mm b/apps/app_shim/app_shim_host_manager_browsertest_mac.mm
index 3e92cbf93dc0b21084d52b2ac5125b2c6f2d1638..546511db73243cc7484a5edf8d28d00943c11332 100644
--- a/apps/app_shim/app_shim_host_manager_browsertest_mac.mm
+++ b/apps/app_shim/app_shim_host_manager_browsertest_mac.mm
@@ -15,6 +15,7 @@
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/common/chrome_paths.h"
+#include "chrome/common/chrome_version_info.h"
#include "chrome/common/mac/app_mode_common.h"
#include "chrome/test/base/in_process_browser_test.h"
#include "content/public/test/test_utils.h"
@@ -226,6 +227,7 @@ class AppShimHostManagerBrowserTestSocketFiles
protected:
base::FilePath directory_in_tmp_;
base::FilePath symlink_path_;
+ base::FilePath version_path_;
private:
virtual bool SetUpUserDataDirectory() OVERRIDE;
@@ -243,6 +245,11 @@ bool AppShimHostManagerBrowserTestSocketFiles::SetUpUserDataDirectory() {
PathService::Get(base::DIR_TEMP, &temp_dir);
EXPECT_TRUE(base::CreateSymbolicLink(temp_dir.Append("chrome-XXXXXX"),
symlink_path_));
+
+ // Create an invalid AppShimVersion file.
+ version_path_ = user_data_dir.Append(app_mode::kAppShimVersionSymlinkName);
+ EXPECT_TRUE(base::CreateSymbolicLink(base::FilePath("invalid_version"),
+ version_path_));
return AppShimHostManagerBrowserTest::SetUpUserDataDirectory();
}
@@ -251,6 +258,7 @@ void AppShimHostManagerBrowserTestSocketFiles::
// Check that created files have been deleted.
EXPECT_FALSE(base::PathExists(directory_in_tmp_));
EXPECT_FALSE(base::PathExists(symlink_path_));
+ EXPECT_FALSE(base::PathExists(version_path_));
}
IN_PROC_BROWSER_TEST_F(AppShimHostManagerBrowserTestSocketFiles,
@@ -268,6 +276,11 @@ IN_PROC_BROWSER_TEST_F(AppShimHostManagerBrowserTestSocketFiles,
base::FilePath socket_path;
ASSERT_TRUE(base::ReadSymbolicLink(symlink_path_, &socket_path));
EXPECT_EQ(app_mode::kAppShimSocketShortName, socket_path.BaseName().value());
+
+ // Check that the AppShimVersion file is correctly written.
+ base::FilePath version;
+ EXPECT_TRUE(base::ReadSymbolicLink(version_path_, &version));
+ EXPECT_EQ(chrome::VersionInfo().Version(), version.value());
}
} // namespace

Powered by Google App Engine
This is Rietveld 408576698