Cleanup: de-inline a bunch of classes, rename and move "PluginInstaller" to "...

chrome/browser/google/google_url_tracker_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/google/google_url_tracker.h"
 
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_thread.h"
@@ skipping 42 matching lines @@
   notified_ = true;
 }
 
 
 // TestInfoBarDelegate --------------------------------------------------------
 
 class TestInfoBarDelegate : public InfoBarDelegate {
  public:
   TestInfoBarDelegate(GoogleURLTracker* google_url_tracker,
                       const GURL& new_google_url);
-  virtual ~TestInfoBarDelegate();
-
-  // InfoBarDelegate
-  virtual InfoBar* CreateInfoBar();
 
   GoogleURLTracker* google_url_tracker() const { return google_url_tracker_; }
   GURL new_google_url() const { return new_google_url_; }
 
  private:
+  virtual ~TestInfoBarDelegate();
+
+  // InfoBarDelegate:
+  virtual InfoBar* CreateInfoBar();
+
   GoogleURLTracker* google_url_tracker_;
   GURL new_google_url_;
 };
 
 TestInfoBarDelegate::TestInfoBarDelegate(GoogleURLTracker* google_url_tracker,
                                          const GURL& new_google_url)
     : InfoBarDelegate(NULL),
       google_url_tracker_(google_url_tracker),
       new_google_url_(new_google_url) {
 }
@@ skipping 210 matching lines @@
   ASSERT_TRUE(infobar->google_url_tracker());
   infobar->google_url_tracker()->CancelGoogleURL(infobar->new_google_url());
 }
 
 void GoogleURLTrackerTest::InfoBarClosed() {
   TestInfoBarDelegate* infobar = static_cast<TestInfoBarDelegate*>(
       g_browser_process->google_url_tracker()->infobar_);
   ASSERT_TRUE(infobar);
   ASSERT_TRUE(infobar->google_url_tracker());
   infobar->google_url_tracker()->InfoBarClosed();
-  delete infobar;
+  delete g_browser_process->google_url_tracker()->infobar_;
 }
 
 void GoogleURLTrackerTest::ExpectDefaultURLs() {
   EXPECT_EQ(GURL(GoogleURLTracker::kDefaultGoogleHomepage),
             GoogleURLTracker::GoogleURL());
   EXPECT_EQ(GURL(), GetFetchedGoogleURL());
 }
 
 
 // Tests ----------------------------------------------------------------------
@@ skipping 167 matching lines @@
   NavEntryCommitted();
   EXPECT_TRUE(InfoBarIsShown());
 
   AcceptGoogleURL();
   InfoBarClosed();
   EXPECT_FALSE(InfoBarIsShown());
   EXPECT_EQ(GURL("http://www.google.co.jp/"), GoogleURLTracker::GoogleURL());
   EXPECT_EQ(GURL("http://www.google.co.jp/"), GetLastPromptedGoogleURL());
   EXPECT_TRUE(observer_->notified());
 }