Revert of Handle TemplateURLService load failure better, and make some test correctness fixes that will be ne…

chrome/browser/ui/browser_instant_controller_unittest.cc

 // Copyright 2013 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 <string>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_vector.h"
-#include "base/metrics/field_trial.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/search/instant_service.h"
 #include "chrome/browser/search/instant_service_observer.h"
 #include "chrome/browser/search/instant_unittest_base.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/ui/browser_instant_controller.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_observer.h"
 
 namespace chrome {
 
 namespace {
 
 class BrowserInstantControllerTest : public InstantUnitTestBase {
- public:
-  virtual void SetUp() OVERRIDE {
-    ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial(
-        "EmbeddedSearch", "Group1 use_cacheable_ntp:1 prefetch_results:1"));
-    InstantUnitTestBase::SetUp();
-  }
-
  protected:
   friend class FakeWebContentsObserver;
 };
 
 const struct TabReloadTestCase {
   const char* description;
   const char* start_url;
   bool start_in_instant_process;
   bool should_reload;
   bool end_in_instant_process;
@@ skipping 134 matching lines @@
 
   browser.reset(NULL);
   window.reset(NULL);
   EXPECT_FALSE(IsInstantServiceObserver(bic))
     << "New BrowserInstantController should register as InstantServiceObserver";
 }
 
 }  // namespace
 
 }  // namespace chrome