Make GTK and Aura parts orthogonal to OS parts

chrome/browser/chrome_content_browser_client.cc

Index: chrome/browser/chrome_content_browser_client.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 27df9071ae3bbe02233e5cbee84896bb59a5a99c..18a0dba530d1a9850370cdf79a43c78f542f7dee 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -74,14 +74,12 @@
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h"
-#elif defined(USE_AURA)
-#include "chrome/browser/chrome_browser_main_aura.h"
 #elif defined(OS_WIN)
 #include "chrome/browser/chrome_browser_main_win.h"
 #elif defined(OS_MACOSX)
 #include "chrome/browser/chrome_browser_main_mac.h"
 #elif defined(OS_LINUX)
-#include "chrome/browser/chrome_browser_main_gtk.h"
+#include "chrome/browser/chrome_browser_main_linux.h"
 #endif
 
 #if defined(OS_LINUX)
@@ -186,16 +184,18 @@ namespace chrome {
 
 content::BrowserMainParts* ChromeContentBrowserClient::CreateBrowserMainParts(
     const MainFunctionParams& parameters) {
+  // Construct the Main browser parts based on the OS type.
+  // Additional parts for GTK or Aura will be constructed in the base
+  // ChromeBrowserMainParts constructor.
+  // Note: OS_CHROMEOS defines OS_LINUX so handle it first.
 #if defined(OS_CHROMEOS)
   return new ChromeBrowserMainPartsChromeos(parameters);
-#elif defined(USE_AURA)
-  return new ChromeBrowserMainPartsAura(parameters);
 #elif defined(OS_WIN)
   return new ChromeBrowserMainPartsWin(parameters);
 #elif defined(OS_MACOSX)
   return new ChromeBrowserMainPartsMac(parameters);
 #elif defined(OS_LINUX)
-  return new ChromeBrowserMainPartsGtk(parameters);
+  return new ChromeBrowserMainPartsLinux(parameters);
 #else
   return NULL;
 #endif