Revert 76228 - Move core pieces of geolocation from chrome to content.This is...

chrome/browser/geolocation/geolocation_permission_context_unittest.cc

 // Copyright (c) 2011 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 "chrome/browser/geolocation/geolocation_permission_context.h"
+
 #include "base/scoped_vector.h"
+#include "chrome/browser/browser_thread.h"
+#include "chrome/browser/geolocation/arbitrator_dependency_factories_for_test.h"
 #include "chrome/browser/geolocation/geolocation_content_settings_map.h"
+#include "chrome/browser/geolocation/geolocation_permission_context.h"
+#include "chrome/browser/geolocation/location_arbitrator.h"
+#include "chrome/browser/geolocation/location_provider.h"
+#include "chrome/browser/geolocation/mock_location_provider.h"
 #include "chrome/browser/tab_contents/infobar_delegate.h"
 #include "chrome/common/notification_details.h"
 #include "chrome/common/notification_type.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/test/testing_profile.h"
-#include "content/browser/browser_thread.h"
-#include "content/browser/geolocation/arbitrator_dependency_factories_for_test.h"
-#include "content/browser/geolocation/geolocation_permission_context.h"
-#include "content/browser/geolocation/location_arbitrator.h"
-#include "content/browser/geolocation/location_provider.h"
-#include "content/browser/geolocation/mock_location_provider.h"
 #include "content/browser/renderer_host/mock_render_process_host.h"
 #include "content/browser/renderer_host/test_render_view_host.h"
 #include "content/browser/tab_contents/test_tab_contents.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 // TestTabContentsWithPendingInfoBar ------------------------------------------
 
 namespace {
 
 // TestTabContents short-circuits TAB_CONTENTS_INFOBAR_REMOVED to call
@@ skipping 422 matching lines @@
   // Ensure only one infobar is created.
   EXPECT_EQ(1U, contents()->infobar_count());
   ConfirmInfoBarDelegate* infobar_0 =
       contents()->GetInfoBarDelegateAt(0)->AsConfirmInfoBarDelegate();
   ASSERT_TRUE(infobar_0);
   string16 text_0 = infobar_0->GetMessageText();
 
   // Delete the tab contents.
   DeleteContents();
 }