Avoid including gtest file directly, and go through base instead

We should consistently:
#include "base/gtest_prod_util.h"
which does the gtest include (from the right place, in a
second repo, hidden in our tree).


This is critical to being able to supplant the FRIEND_TEST
macro, which we're experimenting with to optimize builds.

r=brettw
TBR=other owners (this is a trivial change)
BUG=107727
Review URL: http://codereview.chromium.org/8954017

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114685 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/chromeos/login/existing_user_controller.h

@@ -9,6 +9,7 @@
 #include <string>
 
 #include "base/compiler_specific.h"
+#include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/string16.h"
@@ -24,7 +25,6 @@
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "googleurl/src/gurl.h"
-#include "testing/gtest/include/gtest/gtest_prod.h"
 #include "ui/gfx/rect.h"
 
 #if defined(TOOLKIT_USES_GTK)

chrome/browser/chromeos/login/language_switch_menu.h

@@ -8,8 +8,8 @@
 
 #include <string>
 
+#include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
-#include "testing/gtest/include/gtest/gtest_prod.h"
 #include "ui/views/controls/menu/menu_delegate.h"
 #include "ui/views/controls/menu/view_menu_delegate.h"
 #include "ui/views/view.h"

chrome/browser/chromeos/login/wizard_controller.h

@@ -15,7 +15,6 @@
 #include "chrome/browser/chromeos/login/screen_observer.h"
 #include "chrome/browser/chromeos/login/wizard_screen.h"
 #include "googleurl/src/gurl.h"
-#include "testing/gtest/include/gtest/gtest_prod.h"
 #include "ui/gfx/rect.h"
 
 class PrefService;

chrome/browser/extensions/component_loader.h

@@ -8,11 +8,11 @@
 
 #include <string>
 
+#include "base/gtest_prod_util.h"
 #include "base/file_path.h"
 #include "base/values.h"
 #include "chrome/browser/prefs/pref_change_registrar.h"
 #include "content/public/browser/notification_observer.h"
-#include "testing/gtest/include/gtest/gtest_prod.h"
 
 class Extension;
 class ExtensionServiceInterface;

chrome/browser/history/in_memory_url_index.h

@@ -24,7 +24,6 @@
 #include "chrome/browser/history/in_memory_url_index_types.h"
 #include "chrome/browser/history/in_memory_url_index_cache.pb.h"
 #include "sql/connection.h"
-#include "testing/gtest/include/gtest/gtest_prod.h"
 
 namespace base {
 class Time;

chrome/browser/sync/glue/http_bridge.h

@@ -10,6 +10,7 @@
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/gtest_prod_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/synchronization/lock.h"
 #include "base/synchronization/waitable_event.h"
@@ -19,7 +20,6 @@
 #include "googleurl/src/gurl.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "net/url_request/url_request_context.h"
-#include "testing/gtest/include/gtest/gtest_prod.h"
 
 class MessageLoop;
 class HttpBridgeTest;

chrome/browser/ui/views/bookmarks/bookmark_editor_view.h

@@ -9,11 +9,11 @@
 #include <vector>
 
 #include "base/compiler_specific.h"
+#include "base/gtest_prod_util.h"
 #include "base/string16.h"
 #include "chrome/browser/bookmarks/bookmark_editor.h"
 #include "chrome/browser/bookmarks/bookmark_expanded_state_tracker.h"
 #include "chrome/browser/bookmarks/bookmark_model_observer.h"
-#include "testing/gtest/include/gtest/gtest_prod.h"
 #include "ui/base/models/simple_menu_model.h"
 #include "ui/base/models/tree_node_model.h"
 #include "ui/views/context_menu_controller.h"

chrome_frame/urlmon_url_request_private.h

@@ -11,11 +11,11 @@
 #include <string>
 
 #include "base/callback_old.h"
+#include "base/gtest_prod_util.h"
 #include "base/threading/platform_thread.h"
 #include "net/base/net_errors.h"
 #include "net/http/http_response_headers.h"
 #include "net/url_request/url_request_status.h"
-#include "testing/gtest/include/gtest/gtest_prod.h"
 
 class UrlmonUrlRequest
   : public CComObjectRootEx<CComMultiThreadModel>,

jingle/notifier/base/xmpp_connection.h

@@ -9,6 +9,7 @@
 #pragma once
 
 #include "base/basictypes.h"
+#include "base/gtest_prod_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
@@ -16,7 +17,6 @@
 #include "net/url_request/url_request_context_getter.h"
 #include "talk/base/sigslot.h"
 #include "talk/xmpp/xmppengine.h"
-#include "testing/gtest/include/gtest/gtest_prod.h"
 
 namespace buzz {
 class PreXmppAuth;

net/disk_cache/mem_entry_impl.h

@@ -6,11 +6,11 @@
 #define NET_DISK_CACHE_MEM_ENTRY_IMPL_H_
 #pragma once
 
+#include "base/gtest_prod_util.h"
 #include "base/hash_tables.h"
 #include "base/memory/scoped_ptr.h"
 #include "net/base/net_log.h"
 #include "net/disk_cache/disk_cache.h"
-#include "testing/gtest/include/gtest/gtest_prod.h"
 
 namespace disk_cache {
 

net/socket/socks5_client_socket.h

@@ -9,6 +9,7 @@
 #include <string>
 
 #include "base/basictypes.h"
+#include "base/gtest_prod_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "googleurl/src/gurl.h"
@@ -18,7 +19,6 @@
 #include "net/base/net_errors.h"
 #include "net/base/net_log.h"
 #include "net/socket/stream_socket.h"
-#include "testing/gtest/include/gtest/gtest_prod.h"
 
 namespace net {
 

webkit/appcache/appcache_service.h

@@ -8,12 +8,12 @@
 #include <map>
 #include <set>
 
+#include "base/gtest_prod_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time.h"
 #include "net/base/completion_callback.h"
 #include "net/base/net_errors.h"
-#include "testing/gtest/include/gtest/gtest_prod.h"
 #include "webkit/appcache/appcache_export.h"
 #include "webkit/appcache/appcache_interfaces.h"
 #include "webkit/appcache/appcache_storage.h"