Remove build time differences between Chrome Frame and Google Chrome in the

SafeBrowsing code.

BUG=26012
TEST=None

Review URL: http://codereview.chromium.org/360059

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31209 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 18 insertions, 0 deletions

diff --git a/chrome/installer/util/browser_distribution.cc b/chrome/installer/util/browser_distribution.cc
index 844817c..da796aa 100644
--- a/chrome/installer/util/browser_distribution.cc
+++ b/chrome/installer/util/browser_distribution.cc
@@ -73,6 +73,10 @@ int BrowserDistribution::GetInstallReturnCode(
   return install_status;
 }
 
+std::string BrowserDistribution::GetSafeBrowsingName() {
+  return "chromium";
+}
+
 std::wstring BrowserDistribution::GetStateKey() {
   return L"Software\\Chromium";
 }
diff --git a/chrome/installer/util/browser_distribution.h b/chrome/installer/util/browser_distribution.h
index aa0aa5f..5d26219 100644
--- a/chrome/installer/util/browser_distribution.h
+++ b/chrome/installer/util/browser_distribution.h
@@ -38,6 +38,8 @@ class BrowserDistribution {
   virtual int GetInstallReturnCode(
       installer_util::InstallStatus install_status);
 
+  virtual std::string GetSafeBrowsingName();
+
   virtual std::wstring GetStateKey();
 
   virtual std::wstring GetStateMediumKey();
diff --git a/chrome/installer/util/chrome_frame_distribution.cc b/chrome/installer/util/chrome_frame_distribution.cc
index 85317e6..8d79289 100644
--- a/chrome/installer/util/chrome_frame_distribution.cc
+++ b/chrome/installer/util/chrome_frame_distribution.cc
@@ -53,6 +53,10 @@ std::wstring ChromeFrameDistribution::GetAppDescription() {
   return L"Chrome in a Frame.";
 }
 
+std::string ChromeFrameDistribution::GetSafeBrowsingName() {
+  return "googlechromeframe";
+}
+
 std::wstring ChromeFrameDistribution::GetStateKey() {
   std::wstring key(google_update::kRegPathClientState);
   key.append(L"\\");
diff --git a/chrome/installer/util/chrome_frame_distribution.h b/chrome/installer/util/chrome_frame_distribution.h
index ca9790c..6e5b702 100644
--- a/chrome/installer/util/chrome_frame_distribution.h
+++ b/chrome/installer/util/chrome_frame_distribution.h
@@ -27,6 +27,8 @@ class ChromeFrameDistribution : public BrowserDistribution {
 
   virtual std::wstring GetAppDescription();
 
+  virtual std::string GetSafeBrowsingName();
+
   virtual std::wstring GetStateKey();
 
   virtual std::wstring GetStateMediumKey();
diff --git a/chrome/installer/util/google_chrome_distribution.cc b/chrome/installer/util/google_chrome_distribution.cc
index c5a14d2..1f6538b 100644
--- a/chrome/installer/util/google_chrome_distribution.cc
+++ b/chrome/installer/util/google_chrome_distribution.cc
@@ -302,6 +302,10 @@ int GoogleChromeDistribution::GetInstallReturnCode(
   }
 }
 
+std::string GoogleChromeDistribution::GetSafeBrowsingName() {
+  return "googlechrome";
+}
+
 std::wstring GoogleChromeDistribution::GetStateKey() {
   std::wstring key(google_update::kRegPathClientState);
   key.append(L"\\");
diff --git a/chrome/installer/util/google_chrome_distribution.h b/chrome/installer/util/google_chrome_distribution.h
index b72c534..78fcdec8 100644
--- a/chrome/installer/util/google_chrome_distribution.h
+++ b/chrome/installer/util/google_chrome_distribution.h
@@ -60,6 +60,8 @@ class GoogleChromeDistribution : public BrowserDistribution {
   virtual int GetInstallReturnCode(
       installer_util::InstallStatus install_status);
 
+  virtual std::string GetSafeBrowsingName();
+
   virtual std::wstring GetStateKey();
 
   virtual std::wstring GetStateMediumKey();