ifdef a few pieces of extensions code.

chrome/browser/geolocation/geolocation_permission_context_unittest.cc

Index: chrome/browser/geolocation/geolocation_permission_context_unittest.cc
diff --git a/chrome/browser/geolocation/geolocation_permission_context_unittest.cc b/chrome/browser/geolocation/geolocation_permission_context_unittest.cc
index b243ce6edda42370a22228032080bb10fc48a818..a0ebc1189f941c237cde7d824bc5a5a5f534e69a 100644
--- a/chrome/browser/geolocation/geolocation_permission_context_unittest.cc
+++ b/chrome/browser/geolocation/geolocation_permission_context_unittest.cc
@@ -21,7 +21,6 @@
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/geolocation/geolocation_permission_context_factory.h"
 #include "chrome/browser/infobars/infobar_service.h"
-#include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/infobars/core/confirm_infobar_delegate.h"
@@ -34,7 +33,6 @@
 #include "content/public/test/mock_render_process_host.h"
 #include "content/public/test/test_renderer_host.h"
 #include "content/public/test/web_contents_tester.h"
-#include "extensions/browser/view_type_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(OS_ANDROID)
@@ -43,6 +41,10 @@
 #include "chrome/common/pref_names.h"
 #endif
 
+#if defined(ENABLE_EXTENSIONS)

[Michael van Ouwerkerk, 2014/07/30 10:58:33]

I do appreciate fixing the unit test, but why not do this for
GeolocationPermissionContext itself?

+#include "extensions/browser/view_type_utils.h"
+#endif
+
 using content::MockRenderProcessHost;
 
 
@@ -221,7 +223,9 @@ void GeolocationPermissionContextTests::AddNewTab(const GURL& url) {
       SendNavigate(extra_tabs_.size() + 1, url);
 
   // Set up required helpers, and make this be as "tabby" as the code requires.
+#if defined(ENABLE_EXTENSIONS)
   extensions::SetViewType(new_tab, extensions::VIEW_TYPE_TAB_CONTENTS);
+#endif
   InfoBarService::CreateForWebContents(new_tab);
 
   extra_tabs_.push_back(new_tab);
@@ -247,7 +251,9 @@ void GeolocationPermissionContextTests::SetUp() {
   ChromeRenderViewHostTestHarness::SetUp();
 
   // Set up required helpers, and make this be as "tabby" as the code requires.
+#if defined(ENABLE_EXTENSIONS)
   extensions::SetViewType(web_contents(), extensions::VIEW_TYPE_TAB_CONTENTS);
+#endif
   InfoBarService::CreateForWebContents(web_contents());
   TabSpecificContentSettings::CreateForWebContents(web_contents());
 #if defined(OS_ANDROID)