Simplify the translate infobar code some.

chrome/browser/policy/policy_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 <string>
 
 #include "base/bind.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/scoped_temp_dir.h"
@@ skipping 394 matching lines @@
       content::NotificationService::AllSources());
   ui_test_utils::NavigateToURL(browser(), url);
   language_observer1.Wait();
   // Verify that the translate infobar showed up.
   EXPECT_EQ(1u, infobar_helper->GetInfoBarCount());
   InfoBarDelegate* infobar_delegate = infobar_helper->GetInfoBarDelegateAt(0);
   TranslateInfoBarDelegate* delegate =
       infobar_delegate->AsTranslateInfoBarDelegate();
   ASSERT_TRUE(delegate);
   EXPECT_EQ(TranslateInfoBarDelegate::BEFORE_TRANSLATE, delegate->type());
-  EXPECT_EQ("fr", delegate->GetOriginalLanguageCode());
+  EXPECT_EQ("fr", delegate->original_language_code());
 
   // Now force disable translate.
   ui_test_utils::CloseAllInfoBars(tab_contents);
   EXPECT_EQ(0u, infobar_helper->GetInfoBarCount());
   policies.Set(key::kTranslateEnabled, POLICY_LEVEL_MANDATORY,
                POLICY_SCOPE_USER, base::Value::CreateBooleanValue(false));
   provider_.UpdateChromePolicy(policies);
   // Navigating to the same URL now doesn't trigger an infobar.
   content::WindowedNotificationObserver language_observer2(
       chrome::NOTIFICATION_TAB_LANGUAGE_DETERMINED,
@@ skipping 47 matching lines @@
   policies.Set(key::kURLWhitelist, POLICY_LEVEL_MANDATORY,
                POLICY_SCOPE_USER, whitelist.DeepCopy());
   provider_.UpdateChromePolicy(policies);
   CheckCanOpenURL(browser(), kAAA);
   CheckURLIsBlocked(browser(), kBBB);
   CheckCanOpenURL(browser(), kSUB_BBB);
   CheckCanOpenURL(browser(), kBBB_PATH);
 }
 
 }  // namespace policy