Moving common code into OmniboxView from OmniboxView*

chrome/browser/ui/omnibox/omnibox_edit_unittest.cc

Index: chrome/browser/ui/omnibox/omnibox_edit_unittest.cc
diff --git a/chrome/browser/ui/omnibox/omnibox_edit_unittest.cc b/chrome/browser/ui/omnibox/omnibox_edit_unittest.cc
index a5958d1bf5de453c303a93ca523b37e04e0cfb61..fffc2cc9c4994b4a5e3368f7c0dda648eb172454 100644
--- a/chrome/browser/ui/omnibox/omnibox_edit_unittest.cc
+++ b/chrome/browser/ui/omnibox/omnibox_edit_unittest.cc
@@ -20,10 +20,10 @@ namespace {
 
 class TestingOmniboxView : public OmniboxView {
  public:
-  TestingOmniboxView() {}
+  TestingOmniboxView() : OmniboxView(NULL, NULL, NULL, NULL) {}

[Peter Kasting, 2012/07/26 03:59:17]

Nit: Technically, we're not supposed to provide inline definitions for
non-unix-hacker()-style function even in .cc files... but maybe these sorts of
"do nothing" overrides should be an exception.

[dominich, 2012/07/26 22:33:24]

I think for testing it's often ignored. Especially for these do-nothing
overrides.

 
-  virtual OmniboxEditModel* model() OVERRIDE { return NULL; }
-  virtual const OmniboxEditModel* model() const OVERRIDE { return NULL; }
+  virtual OmniboxEditModel* GetModel() OVERRIDE { return NULL; }

[Peter Kasting, 2012/07/26 03:59:17]

Nit: Given that this class already passes the superclass a NULL Profile* (just
above), I think GetModel() would already always return NULL; thus we don't need
to override it here, which means it doesn't need to be virtual, which means it
can go back to being "model()".

[dominich, 2012/07/26 22:33:24]

Done.

+  virtual const OmniboxEditModel* GetModel() const OVERRIDE { return NULL; }
   virtual void SaveStateToTab(WebContents* tab) OVERRIDE {}
   virtual void Update(const WebContents* tab_for_state_restoring) OVERRIDE {}
   virtual void OpenMatch(const AutocompleteMatch& match,
@@ -33,7 +33,6 @@ class TestingOmniboxView : public OmniboxView {
   virtual string16 GetText() const OVERRIDE { return string16(); }
   virtual bool IsEditingOrEmpty() const OVERRIDE { return true; }
   virtual int GetIcon() const OVERRIDE { return 0; }
-  virtual void SetUserText(const string16& text) OVERRIDE {}
   virtual void SetUserText(const string16& text,
                            const string16& display_text,
                            bool update_popup) OVERRIDE {}
@@ -65,6 +64,9 @@ class TestingOmniboxView : public OmniboxView {
     return NULL;
   }
   virtual CommandUpdater* GetCommandUpdater() OVERRIDE { return NULL; }
+  virtual const CommandUpdater* GetCommandUpdater() const OVERRIDE {
+    return NULL;
+  }
   virtual void SetInstantSuggestion(const string16& input,
                                     bool animate_to_complete) OVERRIDE {}
   virtual string16 GetInstantSuggestion() const OVERRIDE { return string16(); }
@@ -83,6 +85,9 @@ class TestingOmniboxView : public OmniboxView {
   virtual int WidthOfTextAfterCursor() { return 0; }
 #endif
 
+  virtual int GetOmniboxTextLength() const OVERRIDE { return 0; }
+  virtual void EmphasizeURLComponents() OVERRIDE { }
+
  private:
   DISALLOW_COPY_AND_ASSIGN(TestingOmniboxView);
 };