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

chrome/browser/rlz/rlz_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/rlz/rlz.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/stringprintf.h"
 #include "base/path_service.h"
 #include "base/test/test_reg_util_win.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/registry.h"
 #include "chrome/browser/autocomplete/autocomplete.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/env_vars.h"
 #include "chrome/installer/util/browser_distribution.h"
 #include "chrome/installer/util/google_update_constants.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::win::RegKey;
+using content::NavigationEntry;
 using registry_util::RegistryOverrideManager;
 using testing::AssertionResult;
 using testing::AssertionSuccess;
 using testing::AssertionFailure;
 
 namespace {
 
 // Registry path to overridden hive.
 const wchar_t kRlzTempHkcu[] = L"rlz_hkcu";
 const wchar_t kRlzTempHklm[] = L"rlz_hklm";
@@ skipping 193 matching lines @@
   }
 }
 
 void RlzLibTest::SimulateOmniboxUsage() {
   tracker_.Observe(chrome::NOTIFICATION_OMNIBOX_OPENED_URL,
                    content::NotificationService::AllSources(),
                    content::Details<AutocompleteLog>(NULL));
 }
 
 void RlzLibTest::SimulateHomepageUsage() {
-  scoped_ptr<content::NavigationEntry> entry(
-      content::NavigationEntry::Create());
+  scoped_ptr<NavigationEntry> entry(NavigationEntry::Create());
   entry->SetPageID(0);
   entry->SetTransitionType(content::PAGE_TRANSITION_HOME_PAGE);
   tracker_.Observe(content::NOTIFICATION_NAV_ENTRY_PENDING,
                    content::NotificationService::AllSources(),
-                   content::Details<content::NavigationEntry>(entry.get()));
+                   content::Details<NavigationEntry>(entry.get()));
 }
 
 void RlzLibTest::InvokeDelayedInit() {
   tracker_.DelayedInit();
 }
 
 void RlzLibTest::ExpectEventRecorded(const char* event_name, bool expected) {
   char cgi[rlz_lib::kMaxCgiLength];
   GetProductEventsAsCgi(rlz_lib::CHROME, cgi, arraysize(cgi));
   if (expected) {
@@ skipping 318 matching lines @@
   // Make sure cache is now updated.
   tracker_.set_assume_not_ui_thread(false);
 
   EXPECT_TRUE(RLZTracker::GetAccessPointRlz(rlz_lib::CHROME_OMNIBOX, &rlz));
   EXPECT_STREQ(kNewOmniboxRlzString, WideToUTF8(rlz).c_str());
   EXPECT_TRUE(RLZTracker::GetAccessPointRlz(rlz_lib::CHROME_HOME_PAGE, &rlz));
   EXPECT_STREQ(kNewHomepageRlzString, WideToUTF8(rlz).c_str());
 }
 
 TEST_F(RlzLibTest, ObserveHandlesBadArgs) {
-  scoped_ptr<content::NavigationEntry> entry(
-      content::NavigationEntry::Create());
+  scoped_ptr<NavigationEntry> entry(NavigationEntry::Create());
   entry->SetPageID(0);
   entry->SetTransitionType(content::PAGE_TRANSITION_LINK);
   tracker_.Observe(content::NOTIFICATION_NAV_ENTRY_PENDING,
                    content::NotificationService::AllSources(),
-                   content::Details<content::NavigationEntry>(NULL));
+                   content::Details<NavigationEntry>(NULL));
   tracker_.Observe(content::NOTIFICATION_NAV_ENTRY_PENDING,
                    content::NotificationService::AllSources(),
-                   content::Details<content::NavigationEntry>(entry.get()));
+                   content::Details<NavigationEntry>(entry.get()));
 }
 
 TEST_F(RlzLibTest, ReactivationNonOrganicNonOrganic) {
   SetReactivationBrand("REAC");
 
   RLZTracker::InitRlzDelayed(true, 20, true, true);
   InvokeDelayedInit();
 
   ExpectRlzPingSent(true);
   ExpectReactivationRlzPingSent(true);
@@ skipping 25 matching lines @@
   SetMainBrand("GGLS");
   SetReactivationBrand("GGRS");
 
   RLZTracker::InitRlzDelayed(true, 20, true, true);
   InvokeDelayedInit();
 
   ExpectRlzPingSent(false);
   ExpectReactivationRlzPingSent(false);
 }