Rename rlz_lib2.cc and win/lib/rlz_lib.cc to win/lib/rlz_lib_win.cc
BUG=none
TEST=none
TBR=rogerta
Review URL: https://codereview.appspot.com/5875051
git-svn-id: http://rlz.googlecode.com/svn/trunk@113 10bc0f33-e4bf-9a86-80cf-af638054f0c4
diff --git a/lib/financial_ping_test.cc b/lib/financial_ping_test.cc
index 843e094..e797881 100644
--- a/lib/financial_ping_test.cc
+++ b/lib/financial_ping_test.cc
@@ -23,6 +23,7 @@
#include "base/utf_string_conversions.h"
#include "rlz/lib/lib_values.h"
#include "rlz/lib/machine_id.h"
+#include "rlz/lib/rlz_lib.h"
#include "rlz/lib/rlz_value_store.h"
#include "rlz/test/rlz_test_helpers.h"
#include "testing/gmock/include/gmock/gmock.h"
diff --git a/lib/lib_values.h b/lib/lib_values.h
index 6e22d4b..f5e822b 100644
--- a/lib/lib_values.h
+++ b/lib/lib_values.h
@@ -8,7 +8,7 @@
#define RLZ_LIB_LIB_VALUES_H_
#include "base/basictypes.h"
-#include "rlz/win/lib/rlz_lib.h"
+#include "rlz/lib/rlz_enums.h"
namespace rlz_lib {
diff --git a/lib/rlz_lib2.cc b/lib/rlz_lib.cc
similarity index 100%
rename from lib/rlz_lib2.cc
rename to lib/rlz_lib.cc
diff --git a/rlz.gyp b/rlz.gyp
index e1aae72..fa8b4d8 100644
--- a/rlz.gyp
+++ b/rlz.gyp
@@ -40,9 +40,7 @@
'lib/machine_id.cc',
'lib/machine_id.h',
'lib/rlz_enums.h',
- # MSVC can't handle two rlz_lib.cc files in the same library.
- # TODO(thakis): Rename this file once win/lib/rlz_lib.cc has gone away.
- 'lib/rlz_lib2.cc',
+ 'lib/rlz_lib.cc',
'lib/rlz_lib.h',
'lib/lib_values.h',
'lib/rlz_value_store.h',
@@ -59,8 +57,8 @@
'win/lib/machine_id_win.cc',
'win/lib/process_info.cc',
'win/lib/process_info.h',
- 'win/lib/rlz_lib.cc',
'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',
diff --git a/win/lib/rlz_lib.h b/win/lib/rlz_lib.h
index 605d52b..ede66ea 100644
--- a/win/lib/rlz_lib.h
+++ b/win/lib/rlz_lib.h
@@ -24,15 +24,16 @@
#ifndef RLZ_WIN_LIB_RLZ_LIB_H_
#define RLZ_WIN_LIB_RLZ_LIB_H_
+// Clients can get away by just including rlz/lib/rlz_lib.h. This file only
+// contains function definitions for files used by tests. It's mostly kept
+// around for backwards-compatibility.
+
#include "rlz/lib/rlz_lib.h"
-#if defined(OS_WIN)
#include "base/win/registry.h"
-#endif
namespace rlz_lib {
-// TODO(thakis): Port these functions.
#if defined(OS_WIN)
// Initialize temporary HKLM/HKCU registry hives used for testing.
diff --git a/win/lib/rlz_lib.cc b/win/lib/rlz_lib_win.cc
similarity index 100%
rename from win/lib/rlz_lib.cc
rename to win/lib/rlz_lib_win.cc
diff --git a/win/lib/rlz_value_store_registry.cc b/win/lib/rlz_value_store_registry.cc
index 452abd3..a077c88 100644
--- a/win/lib/rlz_value_store_registry.cc
+++ b/win/lib/rlz_value_store_registry.cc
@@ -8,6 +8,7 @@
#include "base/utf_string_conversions.h"
#include "rlz/lib/assert.h"
#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"
