Hide ContentClient getters from embedders so that they they don't reuse content's embedder API. The main reasons are that it makes content's embedder interfaces harder to change if they're reused by the embedder, and that its makes it confusing for embedder code when there are multiple ways to do the same thing.

BUG=227047
Review URL: https://codereview.chromium.org/13409003

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

2 files changed, 4 insertions, 4 deletions

diff --git a/chrome/browser/search/local_ntp_source.cc b/chrome/browser/search/local_ntp_source.cc
index 8b8418e..d1fde35 100644
--- a/chrome/browser/search/local_ntp_source.cc
+++ b/chrome/browser/search/local_ntp_source.cc
@@ -8,11 +8,11 @@
 #include "base/memory/ref_counted_memory.h"
 #include "base/string_util.h"
 #include "chrome/common/url_constants.h"
-#include "content/public/common/content_client.h"
 #include "googleurl/src/gurl.h"
 #include "grit/browser_resources.h"
 #include "grit/ui_resources.h"
 #include "net/url_request/url_request.h"
+#include "ui/base/resource/resource_bundle.h"
 
 namespace {
 
@@ -58,7 +58,7 @@ void LocalNtpSource::StartDataRequest(
   }
 
   scoped_refptr<base::RefCountedStaticMemory> response(
-      content::GetContentClient()->GetDataResourceBytes(identifier));
+      ResourceBundle::GetSharedInstance().LoadDataResourceBytes(identifier));
   callback.Run(response);
 }
 
diff --git a/chrome/browser/search/local_omnibox_popup_source.cc b/chrome/browser/search/local_omnibox_popup_source.cc
index aedf140..1ae3c8a 100644
--- a/chrome/browser/search/local_omnibox_popup_source.cc
+++ b/chrome/browser/search/local_omnibox_popup_source.cc
@@ -9,10 +9,10 @@
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "chrome/common/url_constants.h"
-#include "content/public/common/content_client.h"
 #include "googleurl/src/gurl.h"
 #include "grit/browser_resources.h"
 #include "net/url_request/url_request.h"
+#include "ui/base/resource/resource_bundle.h"
 
 namespace {
 
@@ -61,7 +61,7 @@ void LocalOmniboxPopupSource::StartDataRequest(
   }
 
   scoped_refptr<base::RefCountedStaticMemory> response(
-      content::GetContentClient()->GetDataResourceBytes(identifier));
+      ResourceBundle::GetSharedInstance().LoadDataResourceBytes(identifier));
   callback.Run(response);
 }