More misc. cleanups to minimize future refactoring diffs.

chrome/browser/protector/default_search_provider_change_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 "base/memory/scoped_ptr.h"
 #include "base/metrics/histogram.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/protector/histograms.h"
 #include "chrome/browser/protector/mock_protector_service.h"
 #include "chrome/browser/protector/protector_service_factory.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_prepopulate_data.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/common/url_constants.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "googleurl/src/gurl.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using ::testing::Invoke;
 using ::testing::NiceMock;
 using ::testing::Return;
 
-namespace protector {
-
 namespace {
 
 // Keyword names and URLs used for testing.
-
 const string16 example_info = ASCIIToUTF16("Example.info");
 const string16 example_info_long = ASCIIToUTF16("ExampleSearchEngine.info");
 const std::string http_example_info = "http://example.info/%s";
 const string16 example_com = ASCIIToUTF16("Example.com");
 const string16 example_com_long = ASCIIToUTF16("ExampleSearchEngine.com");
 const std::string http_example_com = "http://example.com/%s";
 const string16 example_net = ASCIIToUTF16("Example.net");
 const std::string http_example_net = "http://example.net/%s";
 
 // Convenience function.
 TemplateURL* MakeTemplateURL(const string16& short_name,
                              const string16& keyword,
                              const std::string& url) {
   TemplateURLData data;
   data.short_name = short_name;
   if (keyword.empty())
     data.SetAutogenerateKeyword(true);
   else
     data.SetKeyword(keyword);
   data.SetURL(url);
   return new TemplateURL(data);
 }
 
 };
 
+namespace protector {
+
 class DefaultSearchProviderChangeTest : public InProcessBrowserTest {
  public:
   virtual void SetUpOnMainThread() OVERRIDE {
     mock_protector_service_ =
         MockProtectorService::BuildForProfile(browser()->profile());
 
     // Ensure that TemplateURLService is loaded.
     turl_service_ =
         TemplateURLServiceFactory::GetForProfile(browser()->profile());
     ui_test_utils::WaitForTemplateURLServiceToLoad(turl_service_);
@@ skipping 464 matching lines @@
   EXPECT_EQ(FindTemplateURL(http_example_info),
             turl_service_->GetDefaultSearchProvider());
 
   // Discard does nothing - backup was already active.
   change->Discard(browser());
   EXPECT_EQ(FindTemplateURL(http_example_info),
             turl_service_->GetDefaultSearchProvider());
 }
 
 }  // namespace protector