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

Unified Diff: chrome/installer/gcapi/gcapi_reactivation_test.cc

Issue 10540003: Move guid generation from chrome/common/ to base/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: installer Created 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/installer/gcapi/gcapi_last_run_test.cc ('k') | chrome_frame/find_dialog.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/gcapi/gcapi_reactivation_test.cc
diff --git a/chrome/installer/gcapi/gcapi_reactivation_test.cc b/chrome/installer/gcapi/gcapi_reactivation_test.cc
index cd55f04aa62448726664dd1648bb6c657e2757cb..7f4a14251be8d590cda70c83367907bdf1a625de 100644
--- a/chrome/installer/gcapi/gcapi_reactivation_test.cc
+++ b/chrome/installer/gcapi/gcapi_reactivation_test.cc
@@ -5,13 +5,13 @@
#include <string>
#include "base/basictypes.h"
+#include "base/guid.h"
#include "base/string_number_conversions.h"
#include "base/stringprintf.h"
#include "base/test/test_reg_util_win.h"
#include "base/time.h"
#include "base/utf_string_conversions.h"
#include "base/win/registry.h"
-#include "chrome/common/guid.h"
#include "chrome/installer/gcapi/gcapi.h"
#include "chrome/installer/gcapi/gcapi_omaha_experiment.h"
#include "chrome/installer/gcapi/gcapi_reactivation.h"
@@ -38,10 +38,10 @@ class GCAPIReactivationTest : public ::testing::Test {
void SetUp() {
// Override keys - this is undone during destruction.
std::wstring hkcu_override = base::StringPrintf(
- L"hkcu_override\\%ls", ASCIIToWide(guid::GenerateGUID()));
+ L"hkcu_override\\%ls", ASCIIToWide(base::GenerateGUID()));
override_manager_.OverrideRegistry(HKEY_CURRENT_USER, hkcu_override);
std::wstring hklm_override = base::StringPrintf(
- L"hklm_override\\%ls", ASCIIToWide(guid::GenerateGUID()));
+ L"hklm_override\\%ls", ASCIIToWide(base::GenerateGUID()));
override_manager_.OverrideRegistry(HKEY_LOCAL_MACHINE, hklm_override);
}
« no previous file with comments | « chrome/installer/gcapi/gcapi_last_run_test.cc ('k') | chrome_frame/find_dialog.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698