Instant: Rename 'preview' to 'overlay'

chrome/browser/instant/instant_test_utils.cc

Index: chrome/browser/instant/instant_test_utils.cc
diff --git a/chrome/browser/instant/instant_test_utils.cc b/chrome/browser/instant/instant_test_utils.cc
index eb288bcef31f7bdcfab38934211325c931b6ccc0..242db0b05bff31c20faf248c7d7058342eb7b484 100644
--- a/chrome/browser/instant/instant_test_utils.cc
+++ b/chrome/browser/instant/instant_test_utils.cc
@@ -28,7 +28,7 @@ std::string WrapScript(const std::string& script) {
 // InstantTestModelObserver --------------------------------------------------
 
 InstantTestModelObserver::InstantTestModelObserver(
-    InstantModel* model,
+    InstantOverlayModel* model,
     chrome::search::Mode::Type desired_mode_type)
     : model_(model),
       desired_mode_type_(desired_mode_type) {
@@ -39,11 +39,12 @@ InstantTestModelObserver::~InstantTestModelObserver() {
   model_->RemoveObserver(this);
 }
 
-void InstantTestModelObserver::WaitUntilDesiredPreviewState() {
+void InstantTestModelObserver::WaitForDesiredOverlayState() {
   run_loop_.Run();
 }
 
-void InstantTestModelObserver::PreviewStateChanged(const InstantModel& model) {
+void InstantTestModelObserver::OverlayStateChanged(
+    const InstantOverlayModel& model) {
   if (model.mode().mode == desired_mode_type_)
     run_loop_.Quit();
 }
@@ -76,7 +77,7 @@ void InstantTestBase::SetupInstant() {
 
 void InstantTestBase::KillInstantRenderView() {
   base::KillProcess(
-      instant()->GetPreviewContents()->GetRenderProcessHost()->GetHandle(),
+      instant()->GetOverlayContents()->GetRenderProcessHost()->GetHandle(),
       content::RESULT_CODE_KILLED,
       false);
 }
@@ -96,12 +97,12 @@ void InstantTestBase::SetOmniboxText(const std::string& text) {
   omnibox()->SetUserText(UTF8ToUTF16(text));
 }
 
-void InstantTestBase::SetOmniboxTextAndWaitForInstantToShow(
+void InstantTestBase::SetOmniboxTextAndWaitForOverlayToShow(
     const std::string& text) {
   InstantTestModelObserver observer(
       instant()->model(), chrome::search::Mode::MODE_SEARCH_SUGGESTIONS);
   SetOmniboxText(text);
-  observer.WaitUntilDesiredPreviewState();
+  observer.WaitForDesiredOverlayState();
 }
 
 bool InstantTestBase::GetBoolFromJS(content::WebContents* contents,
@@ -126,7 +127,7 @@ bool InstantTestBase::GetStringFromJS(content::WebContents* contents,
 }
 
 bool InstantTestBase::ExecuteScript(const std::string& script) {
-  return content::ExecuteScript(instant()->GetPreviewContents(), script);
+  return content::ExecuteScript(instant()->GetOverlayContents(), script);
 }
 
 bool InstantTestBase::CheckVisibilityIs(content::WebContents* contents,