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

android_webview/native/state_serializer_unittests.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "android_webview/native/state_serializer.h"
 
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/pickle.h"
@@ skipping 15 matching lines @@
   EXPECT_TRUE(result);
 
   PickleIterator iterator(pickle);
   result = internal::RestoreHeaderFromPickle(&iterator);
   EXPECT_TRUE(result);
 }
 
 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());
 
   const GURL url("http://url");
   const GURL virtual_url("http://virtual_url");
   content::Referrer referrer;
   referrer.url = GURL("http://referrer_url");
   referrer.policy = WebKit::WebReferrerPolicyOrigin;
   const string16 title(UTF8ToUTF16("title"));
@@ skipping 31 matching lines @@
   EXPECT_EQ(title, copy->GetTitle());
   EXPECT_EQ(content_state, copy->GetContentState());
   EXPECT_EQ(has_post_data, copy->GetHasPostData());
   EXPECT_EQ(original_request_url, copy->GetOriginalRequestURL());
   EXPECT_EQ(base_url_for_data_url, copy->GetBaseURLForDataURL());
   EXPECT_EQ(is_overriding_user_agent, copy->GetIsOverridingUserAgent());
   EXPECT_EQ(timestamp, copy->GetTimestamp());
 }
 
 }  // namespace android_webview