Internal change

PiperOrigin-RevId: 14333081
Change-Id: Ia1b75c60eb48682bf61958709b6deb6ce75bf9af

README.google

diff --git a/README.google b/README.google
index ab81ccf..a283c92 100644
--- a/README.google
+++ b/README.google
@@ -19,3 +19,8 @@
 Because googleurl uses include paths like "googleurl/src/header.h", the source
 is located in a googleurl subdirectory under this directory.  This allows
 the paths to work correctly without adding //third_party to the include path.
+
+2010-01-22: the upstream code uses an open-source version of gunit and the
+google3 code uses a google3 version of gunit.  When importing, be careful
+to use the current google3 names: testing/base/public/googletest.h and
+testing/base/public/gunit.h .  -- mec

googleurl/src/gurl_unittest.cc

diff --git a/googleurl/src/gurl_unittest.cc b/googleurl/src/gurl_unittest.cc
index 9908fd1..a3ce1f6 100644
--- a/googleurl/src/gurl_unittest.cc
+++ b/googleurl/src/gurl_unittest.cc
@@ -4,7 +4,7 @@
 #include "googleurl/src/gurl.h"
 #include "googleurl/src/url_canon.h"
 #include "googleurl/src/url_test_utils.h"
-#include "testing/base/gunit.h"
+#include "testing/base/public/gunit.h"
 
 // Some implementations of base/basictypes.h may define ARRAYSIZE.
 // If it's not defined, we define it to the ARRAYSIZE_UNSAFE macro

googleurl/src/url_canon_unittest.cc

diff --git a/googleurl/src/url_canon_unittest.cc b/googleurl/src/url_canon_unittest.cc
index dcd1b8b..43cc38d 100644
--- a/googleurl/src/url_canon_unittest.cc
+++ b/googleurl/src/url_canon_unittest.cc
@@ -36,7 +36,7 @@
 #include "googleurl/src/url_canon_stdstring.h"
 #include "googleurl/src/url_parse.h"
 #include "googleurl/src/url_test_utils.h"
-#include "testing/base/gunit.h"
+#include "testing/base/public/gunit.h"
 
 // Some implementations of base/basictypes.h may define ARRAYSIZE.
 // If it's not defined, we define it to the ARRAYSIZE_UNSAFE macro

googleurl/src/url_parse_unittest.cc

diff --git a/googleurl/src/url_parse_unittest.cc b/googleurl/src/url_parse_unittest.cc
index 4a3a3d4..95e77f3 100644
--- a/googleurl/src/url_parse_unittest.cc
+++ b/googleurl/src/url_parse_unittest.cc
@@ -29,7 +29,7 @@
 
 #include "base/basictypes.h"
 #include "googleurl/src/url_parse.h"
-#include "testing/base/gunit.h"
+#include "testing/base/public/gunit.h"
 
 // Some implementations of base/basictypes.h may define ARRAYSIZE.
 // If it's not defined, we define it to the ARRAYSIZE_UNSAFE macro

googleurl/src/url_test_utils.h

diff --git a/googleurl/src/url_test_utils.h b/googleurl/src/url_test_utils.h
index 2835f2e..8432945 100644
--- a/googleurl/src/url_test_utils.h
+++ b/googleurl/src/url_test_utils.h
@@ -36,7 +36,7 @@
 #include <string>
 
 #include "googleurl/src/url_canon_internal.h"
-#include "testing/base/gunit.h"
+#include "testing/base/public/gunit.h"
 
 namespace url_test_utils {