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

content/browser/webui/web_ui_data_source_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/bind.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/utf_string_conversions.h"
 #include "content/browser/webui/web_ui_data_source_impl.h"
 #include "content/test/test_content_client.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 34 matching lines @@
           arraysize(kDummytResource));
     }
     return bytes;
   }
 };
 
 }
 
 class WebUIDataSourceTest : public testing::Test {
  public:
-  WebUIDataSourceTest() : result_data_(NULL), old_client_(NULL) {}
+  WebUIDataSourceTest() : result_data_(NULL) {}
   virtual ~WebUIDataSourceTest() {}
   WebUIDataSourceImpl* source() { return source_.get(); }
 
   void StartDataRequest(const std::string& path) {
      source_->StartDataRequest(
         path,
         false,
         base::Bind(&WebUIDataSourceTest::SendResult,
         base::Unretained(this)));
   }
 
   std::string GetMimeType(const std::string& path) const {
     return source_->GetMimeType(path);
   }
 
   scoped_refptr<base::RefCountedMemory> result_data_;
 
  private:
   virtual void SetUp() {
-    old_client_ = GetContentClient();
     SetContentClient(&client_);
     WebUIDataSource* source = WebUIDataSourceImpl::Create("host");
     WebUIDataSourceImpl* source_impl = static_cast<WebUIDataSourceImpl*>(
         source);
     source_impl->disable_set_font_strings_for_testing();
     source_ = make_scoped_refptr(source_impl);
   }
 
-  virtual void TearDown() {
-    SetContentClient(old_client_);
-  }
-
   // Store response for later comparisons.
   void SendResult(base::RefCountedMemory* data) {
     result_data_ = data;
   }
 
   scoped_refptr<WebUIDataSourceImpl> source_;
   TestClient client_;
-  ContentClient* old_client_;
 };
 
 TEST_F(WebUIDataSourceTest, EmptyStrings) {
   source()->SetJsonPath("strings.js");
   StartDataRequest("strings.js");
   std::string result(reinterpret_cast<const char*>(
       result_data_->front()), result_data_->size());
   EXPECT_NE(result.find("var templateData = {"), std::string::npos);
   EXPECT_NE(result.find("};"), std::string::npos);
 }
@@ skipping 45 matching lines @@
   EXPECT_EQ(GetMimeType("foo"), html);
   EXPECT_EQ(GetMimeType("foo.html"), html);
   EXPECT_EQ(GetMimeType(".js"), js);
   EXPECT_EQ(GetMimeType("foo.js"), js);
   EXPECT_EQ(GetMimeType("js"), html);
   EXPECT_EQ(GetMimeType("foojs"), html);
   EXPECT_EQ(GetMimeType("foo.jsp"), html);
 }
 
 }  // namespace content