Hide ContentClient getters from embedders so that they they don't reuse content's embedder API. The…

android_webview/native/state_serializer_unittests.cc

Index: android_webview/native/state_serializer_unittests.cc
===================================================================
--- android_webview/native/state_serializer_unittests.cc	(revision 192622)
+++ android_webview/native/state_serializer_unittests.cc	(working copy)
@@ -33,9 +33,9 @@
 TEST(AndroidWebViewStateSerializerTest, TestNavigationEntrySerialization) {
   // This is required for NavigationEntry::Create.
   content::ContentClient content_client;
+  content::SetContentClient(&content_client);
   content::ContentBrowserClient browser_client;
-  content_client.set_browser_for_testing(&browser_client);
-  content::SetContentClient(&content_client);
+  content::SetBrowserClientForTesting(&browser_client);
 
   scoped_ptr<content::NavigationEntry> entry(
       content::NavigationEntry::Create());