Rename NavigationController to NavigationControllerImpl and put it into the content namespace. Al...

chrome/browser/geolocation/geolocation_settings_state_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 <string>
 
 #include "base/message_loop.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/geolocation/geolocation_settings_state.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using content::BrowserThread;
+using content::NavigationEntry;
 
 namespace {
 
 class GeolocationSettingsStateTests : public testing::Test {
  public:
   GeolocationSettingsStateTests()
     : ui_thread_(BrowserThread::UI, &message_loop_) {
   }
 
  protected:
   MessageLoop message_loop_;
   content::TestBrowserThread ui_thread_;
 };
 
 TEST_F(GeolocationSettingsStateTests, ClearOnNewOrigin) {
   TestingProfile profile;
   GeolocationSettingsState state(&profile);
   GURL url_0("http://www.example.com");
 
-  scoped_ptr<content::NavigationEntry> entry(
-      content::NavigationEntry::Create());
+  scoped_ptr<NavigationEntry> entry(NavigationEntry::Create());
   entry->SetURL(url_0);
   content::LoadCommittedDetails load_committed_details;
   load_committed_details.entry = entry.get();
   state.DidNavigate(load_committed_details);
 
   profile.GetHostContentSettingsMap()->SetContentSetting(
       ContentSettingsPattern::FromURLNoWildcard(url_0),
       ContentSettingsPattern::FromURLNoWildcard(url_0),
       CONTENT_SETTINGS_TYPE_GEOLOCATION,
       std::string(),
@@ skipping 84 matching lines @@
   state.GetDetailedInfo(&formatted_host_per_state, &tab_state_flags);
   EXPECT_TRUE(formatted_host_per_state.empty());
   EXPECT_EQ(0U, tab_state_flags);
 }
 
 TEST_F(GeolocationSettingsStateTests, ShowPortOnSameHost) {
   TestingProfile profile;
   GeolocationSettingsState state(&profile);
   GURL url_0("http://www.example.com");
 
-  scoped_ptr<content::NavigationEntry> entry(
-      content::NavigationEntry::Create());
+  scoped_ptr<NavigationEntry> entry(NavigationEntry::Create());
   entry->SetURL(url_0);
   content::LoadCommittedDetails load_committed_details;
   load_committed_details.entry = entry.get();
   state.DidNavigate(load_committed_details);
 
   profile.GetHostContentSettingsMap()->SetContentSetting(
       ContentSettingsPattern::FromURLNoWildcard(url_0),
       ContentSettingsPattern::FromURLNoWildcard(url_0),
       CONTENT_SETTINGS_TYPE_GEOLOCATION,
       std::string(),
@@ skipping 50 matching lines @@
             formatted_host_per_state[CONTENT_SETTING_ALLOW].count(
                 url_2.host()));
   EXPECT_EQ(1U, formatted_host_per_state[CONTENT_SETTING_BLOCK].size());
   EXPECT_EQ(1U,
             formatted_host_per_state[CONTENT_SETTING_BLOCK].count(
                 url_1.spec()));
 }
 
 
 }  // namespace