Rename user_key to registry_util.
No code change.
BUG=none
TEST=none
Review URL: https://codereview.appspot.com/5967046
git-svn-id: http://rlz.googlecode.com/svn/trunk@126 10bc0f33-e4bf-9a86-80cf-af638054f0c4
diff --git a/rlz.gyp b/rlz.gyp
index b03f8cb..938c4b7 100644
--- a/rlz.gyp
+++ b/rlz.gyp
@@ -62,12 +62,12 @@
'win/lib/machine_id_win.cc',
'win/lib/process_info.cc',
'win/lib/process_info.h',
+ 'win/lib/registry_util.cc',
+ 'win/lib/registry_util.h',
'win/lib/rlz_lib.h',
'win/lib/rlz_lib_win.cc',
'win/lib/rlz_value_store_registry.cc',
'win/lib/rlz_value_store_registry.h',
- 'win/lib/user_key.cc',
- 'win/lib/user_key.h',
'win/lib/vista_winnt.h',
],
'conditions': [
diff --git a/win/lib/machine_deal.cc b/win/lib/machine_deal.cc
index 544f44c..93a2fbb 100644
--- a/win/lib/machine_deal.cc
+++ b/win/lib/machine_deal.cc
@@ -18,8 +18,8 @@
#include "rlz/lib/assert.h"
#include "rlz/lib/lib_values.h"
#include "rlz/win/lib/lib_mutex.h"
+#include "rlz/win/lib/registry_util.h"
#include "rlz/win/lib/rlz_value_store_registry.h"
-#include "rlz/win/lib/user_key.h"
const wchar_t kDccValueName[] = L"DCC";
diff --git a/win/lib/user_key.cc b/win/lib/registry_util.cc
similarity index 98%
rename from win/lib/user_key.cc
rename to win/lib/registry_util.cc
index 7a687c7..02dd309 100644
--- a/win/lib/user_key.cc
+++ b/win/lib/registry_util.cc
@@ -5,7 +5,7 @@
// A helper library to keep track of a user's key by SID.
// Used by RLZ libary. Also to be used by SearchWithGoogle library.
-#include "rlz/win/lib/user_key.h"
+#include "rlz/win/lib/registry_util.h"
#include "base/process_util.h"
#include "base/utf_string_conversions.h"
diff --git a/win/lib/user_key.h b/win/lib/registry_util.h
similarity index 80%
rename from win/lib/user_key.h
rename to win/lib/registry_util.h
index da1902e..cc62351 100644
--- a/win/lib/user_key.h
+++ b/win/lib/registry_util.h
@@ -2,9 +2,8 @@
// Use of this source code is governed by an Apache-style license that can be
// found in the COPYING file.
-// TODO(thakis): Rename this file to registry_util.
-#ifndef RLZ_WIN_LIB_USER_KEY_H_
-#define RLZ_WIN_LIB_USER_KEY_H_
+#ifndef RLZ_WIN_LIB_REGISTRY_UTIL_H_
+#define RLZ_WIN_LIB_REGISTRY_UTIL_H_
namespace base {
namespace win {
@@ -27,4 +26,4 @@
} // namespace rlz_lib
-#endif // RLZ_WIN_LIB_USER_KEY_H_
+#endif // RLZ_WIN_LIB_REGISTRY_UTIL_H_
diff --git a/win/lib/rlz_value_store_registry.cc b/win/lib/rlz_value_store_registry.cc
index 6518f80..dcc0e9c 100644
--- a/win/lib/rlz_value_store_registry.cc
+++ b/win/lib/rlz_value_store_registry.cc
@@ -11,7 +11,7 @@
#include "rlz/lib/lib_values.h"
#include "rlz/lib/rlz_lib.h"
#include "rlz/lib/string_utils.h"
-#include "rlz/win/lib/user_key.h"
+#include "rlz/win/lib/registry_util.h"
namespace rlz_lib {
