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

content/renderer/pepper/pepper_file_chooser_host_unittest.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 "base/files/file_path.h"
 #include "base/utf_string_conversions.h"
 #include "content/common/view_messages.h"
 #include "content/public/common/file_chooser_params.h"
 #include "content/public/test/render_view_test.h"
 #include "content/renderer/pepper/mock_renderer_ppapi_host.h"
@@ skipping 13 matching lines @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/shell_dialogs/selected_file_info.h"
 
 namespace content {
 
 namespace {
 
 class PepperFileChooserHostTest : public RenderViewTest {
  public:
   PepperFileChooserHostTest()
-      : pp_instance_(123456),
-        old_content_client_(NULL) {}
+      : pp_instance_(123456) {}
 
   virtual void SetUp() {
-    old_content_client_ = GetContentClient();
     SetContentClient(&client_);
     RenderViewTest::SetUp();
 
     globals_.GetResourceTracker()->DidCreateInstance(pp_instance_);
   }
   virtual void TearDown() {
     globals_.GetResourceTracker()->DidDeleteInstance(pp_instance_);
 
     RenderViewTest::TearDown();
-    SetContentClient(old_content_client_);
   }
 
   PP_Instance pp_instance() const { return pp_instance_; }
 
  private:
   PP_Instance pp_instance_;
 
   ppapi::TestGlobals globals_;
   TestContentClient client_;
-
-  // Original value for the content client.
-  ContentClient* old_content_client_;
 };
 
 // For testing to convert our hardcoded file paths to 8-bit.
 std::string FilePathToUTF8(const base::FilePath::StringType& path) {
 #if defined(OS_WIN)
   return UTF16ToUTF8(path);
 #else
   return path;
 #endif
 }
@@ skipping 78 matching lines @@
   accept.push_back("text/plain");
   PpapiHostMsg_FileChooser_Show show_msg(false, false, std::string(), accept);
 
   ppapi::proxy::ResourceMessageCallParams call_params(pp_resource, 0);
   ppapi::host::HostMessageContext context(call_params);
   int32 result = chooser.OnResourceMessageReceived(show_msg, &context);
   EXPECT_EQ(PP_ERROR_NO_USER_GESTURE, result);
 }
 
 }  // namespace content