Remove dependency of chrome in GuestViewBase.

chrome/browser/extensions/api/chrome_extensions_api_client.cc

Index: chrome/browser/extensions/api/chrome_extensions_api_client.cc
diff --git a/chrome/browser/extensions/api/chrome_extensions_api_client.cc b/chrome/browser/extensions/api/chrome_extensions_api_client.cc
index 7f6ed20d40147cc9c944378dac87ae4eb6b21290..adc653b08a196ffc6a59e2a86b64055b219e20db 100644
--- a/chrome/browser/extensions/api/chrome_extensions_api_client.cc
+++ b/chrome/browser/extensions/api/chrome_extensions_api_client.cc
@@ -6,7 +6,6 @@
 
 #include "base/files/file_path.h"
 #include "chrome/browser/extensions/api/storage/sync_value_store_cache.h"
-#include "chrome/browser/guest_view/app_view/app_view_guest.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "device/hid/hid_service.h"
@@ -15,6 +14,12 @@
 #include "chrome/browser/extensions/api/storage/managed_value_store_cache.h"
 #endif
 
+#if defined(ENABLE_EXTENSIONS)
+#include "chrome/browser/guest_view/app_view/app_view_guest.h"
+#include "chrome/browser/guest_view/extension_options/extension_options_guest.h"
+#include "chrome/browser/guest_view/web_view/web_view_guest.h"
+#endif
+
 namespace extensions {
 
 ChromeExtensionsAPIClient::ChromeExtensionsAPIClient() {}
@@ -67,4 +72,10 @@ device::HidService* ChromeExtensionsAPIClient::GetHidService() {
   return hid_service_.get();
 }
 
+void ChromeExtensionsAPIClient::RegisterGuestViewType() {
+  AppViewGuest::Register();

[Ken Rockot(use gerrit already), 2014/08/07 22:37:40]

Please also wrap these Register() calls in an #if defined(ENABLE_EXTENSIONS) as
well

[Xi Han, 2014/08/08 14:12:11]

Wait a second. It is safe to add #if defined(ENABLE_EXTENSIONS), but I begin to
think about whether it is necessary in this class (also the #if defined that I
added in the "includes"). This class is called ChromeExtensionsAPIClient, can we
assume that extensions is enable here?

+  ExtensionOptionsGuest::Register();
+  WebViewGuest::Register();
+}
+
 }  // namespace extensions