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

chrome/browser/search/local_omnibox_popup_source.cc

Index: chrome/browser/search/local_omnibox_popup_source.cc
===================================================================
--- chrome/browser/search/local_omnibox_popup_source.cc	(revision 192622)
+++ chrome/browser/search/local_omnibox_popup_source.cc	(working copy)
@@ -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 @@
   }
 
   scoped_refptr<base::RefCountedStaticMemory> response(
-      content::GetContentClient()->GetDataResourceBytes(identifier));
+      ResourceBundle::GetSharedInstance().LoadDataResourceBytes(identifier));
   callback.Run(response);
 }