Revert of Use ExtensionRegistryObserver

chrome/browser/autocomplete/extension_app_provider_unittest.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 "base/basictypes.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "chrome/browser/autocomplete/extension_app_provider.h"
 #include "chrome/browser/history/history_service.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/history/url_database.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::ASCIIToUTF16;
 
 class ExtensionAppProviderTest : public testing::Test {
  protected:
   struct test_data {
     const base::string16 input;
     const size_t num_results;
     const GURL output[3];
   };
 
   ExtensionAppProviderTest()
       : ui_thread_(content::BrowserThread::UI, &message_loop_),
-        profile_(new TestingProfile),
-        app_provider_(new ExtensionAppProvider(NULL, profile_.get())),
-        history_service_(NULL) {}
+        history_service_(NULL) { }
   virtual ~ExtensionAppProviderTest() { }
 
   virtual void SetUp() OVERRIDE;
 
   void RunTest(test_data* keyword_cases,
                int num_cases);
 
  protected:
   base::MessageLoopForUI message_loop_;
   content::TestBrowserThread ui_thread_;
+  scoped_refptr<ExtensionAppProvider> app_provider_;
   scoped_ptr<TestingProfile> profile_;
-  scoped_refptr<ExtensionAppProvider> app_provider_;
   HistoryService* history_service_;
 };
 
 void ExtensionAppProviderTest::SetUp() {
+  profile_.reset(new TestingProfile());
   ASSERT_TRUE(profile_->CreateHistoryService(true, false));
   profile_->BlockUntilHistoryProcessesPendingRequests();
   history_service_ =
       HistoryServiceFactory::GetForProfile(profile_.get(),
                                            Profile::EXPLICIT_ACCESS);
 
+  app_provider_ = new ExtensionAppProvider(NULL, profile_.get());
+
   struct TestExtensionApp {
     const char* app_name;
     const char* launch_url;
     bool should_match_against_launch_url;
     const char* title;
     int typed_count;
   } kExtensionApps[] = {
     {"COYB", "http://asdf/",            true,  "COYB", 7},
     {"NSNO", "http://fdsa/",            true,  "NSNO", 2},
     {"APPP", "chrome-extension://xyz/", false, "APPP", 2},
@@ skipping 83 matching lines @@
     ExtensionAppProvider::ExtensionApp extension_app =
         {ASCIIToUTF16(cases[i].name), url, true};
     AutocompleteMatch match =
         app_provider_->CreateAutocompleteMatch(input,
                                                extension_app,
                                                0,
                                                base::string16::npos);
     EXPECT_EQ(ASCIIToUTF16(cases[i].match_contents), match.contents);
   }
 }