Make OmniboxEditModel::UpdatePermanentText() fetch the new text itself rather

chrome/browser/ui/omnibox/omnibox_view_browsertest.cc

 // Copyright (c) 2012 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 <stdio.h>
 
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 12 matching lines @@
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/omnibox/location_bar.h"
 #include "chrome/browser/ui/omnibox/omnibox_popup_model.h"
 #include "chrome/browser/ui/omnibox/omnibox_view.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
+#include "chrome/browser/ui/toolbar/test_toolbar_model.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/interactive_test_utils.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_contents.h"
 #include "net/dns/mock_host_resolver.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/base/clipboard/scoped_clipboard_writer.h"
@@ skipping 1622 matching lines @@
 
   // Middle-clicking should not be handled by the omnibox.
   ASSERT_NO_FATAL_FAILURE(ClickBrowserWindowCenter());
   ASSERT_NO_FATAL_FAILURE(ClickOmnibox(ui_controls::MIDDLE, click, click));
   EXPECT_FALSE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_OMNIBOX));
   EXPECT_FALSE(omnibox_view->IsSelectAll());
 }
 #endif  // defined(TOOLKIT_VIEWS)
 
 IN_PROC_BROWSER_TEST_F(OmniboxViewTest, CopyURLToClipboard) {
+  // Set permanent text thus making sure that omnibox treats 'google.com'
+  // as URL (not as ordinary user input).
+  TestToolbarModel* toolbar_model = new TestToolbarModel;

[msw, 2013/08/30 16:12:16]

Remove |toolbar_model|, rename |toolbar_model_deleter| to |toolbar_model|.

[Peter Kasting, 2013/08/30 18:26:48]

I need a TestToolbarModel type to call set_text(), which doesn't exist on
ToolbarModel.

I could do something like this:

  scoped_ptr<ToolbarModel> toolbar_model(new TestToolbarModel());
  static_cast<TestToolbarModel*>(toolbar_model.get())->set_text(...);

...But I decided that was ugly compared to the current method; casting to
something you _just had_ seems lame.

So I'd rather leave it the current way.

[msw, 2013/08/30 18:32:26]

Ah, I didn't realize it was using test-specific API and I agree. Can you rename
|toolbar_model| to |test_toolbar_model| and then rename |toolbar_model_deleter|
to |toolbar_model|? 'Deleter' seem really odd.

+  scoped_ptr<ToolbarModel> toolbar_model_deleter(toolbar_model);
+  toolbar_model->set_text(ASCIIToUTF16("http://www.google.com/"));
+  browser()->swap_toolbar_models(&toolbar_model_deleter);
+  OmniboxEditModel* edit_model = omnibox_view->model();
+  ASSERT_NE(static_cast<OmniboxEditModel*>(NULL), edit_model);
+  edit_model->UpdatePermanentText();
+
   OmniboxView* omnibox_view = NULL;
   ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view));
   const char* target_url = "http://www.google.com/calendar";
   omnibox_view->SetUserText(ASCIIToUTF16(target_url));
 
-  // Set permanent text thus making sure that omnibox treats 'google.com'
-  // as URL (not as ordinary user input).
-  OmniboxEditModel* edit_model = omnibox_view->model();
-  ASSERT_NE(static_cast<OmniboxEditModel*>(NULL), edit_model);
-  edit_model->UpdatePermanentText(ASCIIToUTF16("http://www.google.com/"));
-
   // Location bar must have focus.
   chrome::FocusLocationBar(browser());
   ASSERT_TRUE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_OMNIBOX));
 
   // Select full URL and copy it to clipboard. General text and html should
   // be available.
   omnibox_view->SelectAll(true);
   EXPECT_TRUE(omnibox_view->IsSelectAll());
   ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread();
   clipboard->Clear(ui::Clipboard::BUFFER_STANDARD);
@@ skipping 12 matching lines @@
 #if defined(OS_WIN) || defined(OS_CHROMEOS) || defined(OS_MACOSX)
   string16 title;
   std::string url;
   clipboard->ReadBookmark(&title, &url);
   EXPECT_EQ(target_url, url);
   EXPECT_EQ(ASCIIToUTF16(target_url), title);
 #endif
 }
 
 IN_PROC_BROWSER_TEST_F(OmniboxViewTest, CutURLToClipboard) {
+  // Set permanent text thus making sure that omnibox treats 'google.com'
+  // as URL (not as ordinary user input).
+  TestToolbarModel* toolbar_model = new TestToolbarModel;

[msw, 2013/08/30 16:12:16]

ditto

+  scoped_ptr<ToolbarModel> toolbar_model_deleter(toolbar_model);
+  toolbar_model->set_text(ASCIIToUTF16("http://www.google.com/"));
+  browser()->swap_toolbar_models(&toolbar_model_deleter);
+  OmniboxEditModel* edit_model = omnibox_view->model();
+  ASSERT_NE(static_cast<OmniboxEditModel*>(NULL), edit_model);
+  edit_model->UpdatePermanentText();
+
   OmniboxView* omnibox_view = NULL;
   ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view));
   const char* target_url = "http://www.google.com/calendar";
   omnibox_view->SetUserText(ASCIIToUTF16(target_url));
 
-  // Set permanent text thus making sure that omnibox treats 'google.com'
-  // as URL (not as ordinary user input).
-  OmniboxEditModel* edit_model = omnibox_view->model();
-  ASSERT_NE(static_cast<OmniboxEditModel*>(NULL), edit_model);
-  edit_model->UpdatePermanentText(ASCIIToUTF16("http://www.google.com/"));
-
   // Location bar must have focus.
   chrome::FocusLocationBar(browser());
   ASSERT_TRUE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_OMNIBOX));
 
   // Select full URL and cut it. General text and html should be available
   // in the clipboard.
   omnibox_view->SelectAll(true);
   EXPECT_TRUE(omnibox_view->IsSelectAll());
   ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread();
   clipboard->Clear(ui::Clipboard::BUFFER_STANDARD);
@@ skipping 123 matching lines @@
 #if defined(OS_MACOSX)
   // Mac uses alt-left/right to select a word.
   const int modifiers = ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN;
 #else
   const int modifiers = ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN;
 #endif
   ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_LEFT, modifiers));
   ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_LEFT, modifiers));
   ASSERT_EQ(ASCIIToUTF16("www.bar.com/2"), omnibox_view->GetText());
 }