Build fixes to get use_aura && !use_ash to build.

Also, build more stuff on win_aura.

BUG=none
TEST=none
Review URL: https://chromiumcodereview.appspot.com/10260033

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

9 files changed, 30 insertions, 21 deletions

diff --git a/build/all.gyp b/build/all.gyp
index e7470e5..22a9c63 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -561,9 +561,11 @@
           'target_name': 'aura_builder',
           'type': 'none',
           'dependencies': [
+            '../chrome/chrome.gyp:browser_tests',
             '../chrome/chrome.gyp:chrome',
-            '../chrome/chrome.gyp:unit_tests',
+            '../chrome/chrome.gyp:interactive_ui_tests',            
             '../chrome/chrome.gyp:ui_tests',
+            '../chrome/chrome.gyp:unit_tests',
             '../ui/aura/aura.gyp:*',
             '../ui/gfx/compositor/compositor.gyp:*',
             '../ui/ui.gyp:gfx_unittests',
diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc
index da1f15a..88478c5 100644
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -108,7 +108,7 @@
 #include "chrome/browser/ui/views/ash/chrome_shell_delegate.h"
 #include "chrome/browser/ui/views/ash/launcher/launcher_updater.h"
 #include "chrome/browser/ui/views/ash/window_positioner.h"
-#elif defined(OS_WIN)
+#elif defined(OS_WIN) && !defined(USE_AURA)
 #include "base/win/metro.h"
 #include "chrome/browser/aeropeek_manager.h"
 #include "chrome/browser/jumplist_win.h"
diff --git a/chrome/browser/ui/views/stubs_aura.cc b/chrome/browser/ui/views/stubs_aura.cc
index 4bae160..c5a4e30 100644
--- a/chrome/browser/ui/views/stubs_aura.cc
+++ b/chrome/browser/ui/views/stubs_aura.cc
@@ -35,17 +35,6 @@ class Widget;
 
 namespace browser {
 
-#if defined(OS_WIN)
-void ShowSSLClientCertificateSelector(
-    TabContentsWrapper* parent,
-    const net::HttpNetworkSession* network_session,
-    net::SSLCertRequestInfo* cert_request_info,
-    const base::Callback<void(net::X509Certificate*)>& callback) {
-  // TODO(beng):
-  NOTIMPLEMENTED();
-}
-#endif
-
 void ShowAboutIPCDialog() {
   // TODO(beng):
   NOTIMPLEMENTED();
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 1655600..6fbf61e 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -864,6 +864,14 @@
             '../net/net.gyp:net_unittests',
             '../ui/ui.gyp:ui_unittests',
           ],
+          'conditions': [
+            ['use_aura==1', {
+              'dependencies!': [
+                '../chrome_frame/chrome_frame.gyp:chrome_frame_tests',
+                '../chrome_frame/chrome_frame.gyp:chrome_frame_net_tests',
+              ],
+            }],
+          ],
         },
         {
           'target_name': 'chrome_version_resources',
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 4f4cd2e..f7ec452 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -3438,6 +3438,9 @@
         ['use_aura==1', {
           'sources!': [
             '../content/browser/plugin_browsertest.cc',
+            '../content/browser/accessibility/dump_accessibility_tree_browsertest.cc',
+            '../content/browser/accessibility/dump_accessibility_tree_helper_win.cc',
+            '../content/browser/accessibility/dump_accessibility_tree_helper.cc',
           ]},
         ],
       ],  # conditions
diff --git a/chrome/test/base/view_event_test_base.cc b/chrome/test/base/view_event_test_base.cc
index 91be23d..4d51438 100644
--- a/chrome/test/base/view_event_test_base.cc
+++ b/chrome/test/base/view_event_test_base.cc
@@ -15,8 +15,10 @@
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
-#if defined(USE_AURA)
+#if defined(USE_ASH)
 #include "ash/shell.h"
+#endif
+#if defined(USE_AURA)
 #include "ui/aura/client/event_client.h"
 #include "ui/aura/env.h"
 #include "ui/aura/root_window.h"
@@ -81,7 +83,7 @@ void ViewEventTestBase::Done() {
 
 void ViewEventTestBase::SetUp() {
   ui::CompositorTestSupport::Initialize();
-#if defined(USE_AURA)
+#if defined(USE_ASH)
   ash::Shell::CreateInstance(NULL);
   // The shell runs with a locked screen in tests, so we must clear the event
   // client so it doesn't interfere with event propagation.
@@ -101,8 +103,10 @@ void ViewEventTestBase::TearDown() {
 #endif
     window_ = NULL;
   }
-#if defined(USE_AURA)
+#if defined(USE_ASH)
   ash::Shell::DeleteInstance();
+#endif
+#if defined(USE_AURA)
   aura::Env::DeleteInstance();
 #endif
   ui::CompositorTestSupport::Terminate();
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index ad9c299..df47b5e0 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -372,6 +372,9 @@
           'dependencies': [
             '../ui/aura/aura.gyp:aura',
           ],
+          'sources!': [
+            'browser/accessibility/browser_accessibility_win_unittest.cc',
+          ],
         }],
       ],
     },
diff --git a/ui/gfx/monitor.cc b/ui/gfx/monitor.cc
index ea342c5..de0b3e0 100644
--- a/ui/gfx/monitor.cc
+++ b/ui/gfx/monitor.cc
@@ -50,7 +50,7 @@ Monitor::Monitor(int id, const gfx::Rect& bounds)
       bounds_(bounds),
       work_area_(bounds),
       device_scale_factor_(GetDefaultDeviceScaleFactor()) {
-#if defined(USE_ASH)
+#if defined(USE_AURA)
   SetScaleAndBounds(device_scale_factor_, bounds);
 #endif
 }
@@ -63,7 +63,7 @@ void Monitor::SetScaleAndBounds(
     const gfx::Rect& bounds_in_pixel) {
   Insets insets = bounds_.InsetsFrom(work_area_);
   device_scale_factor_ = device_scale_factor;
-#if defined(USE_ASH)
+#if defined(USE_AURA)
   bounds_in_pixel_ = bounds_in_pixel;
 #endif
   // TODO(oshima): For m19, work area/monitor bounds that chrome/webapps sees
@@ -81,7 +81,7 @@ void Monitor::SetScaleAndBounds(
 void Monitor::SetSize(const gfx::Size& size_in_pixel) {
   SetScaleAndBounds(
       device_scale_factor_,
-#if defined(USE_ASH)
+#if defined(USE_AURA)
       gfx::Rect(bounds_in_pixel_.origin(), size_in_pixel));
 #else
       gfx::Rect(bounds_.origin(), size_in_pixel));
diff --git a/ui/gfx/monitor.h b/ui/gfx/monitor.h
index 704d6c2..b5a6933 100644
--- a/ui/gfx/monitor.h
+++ b/ui/gfx/monitor.h
@@ -69,7 +69,7 @@ class UI_EXPORT Monitor {
   // |work_area_insets| and the bounds.
   void UpdateWorkAreaFromInsets(const gfx::Insets& work_area_insets);
 
-#if defined(USE_ASH)
+#if defined(USE_AURA)
   // TODO(oshima): |bounds()| on ash is not screen's coordinate and
   // this is an workaround for this. This will be removed when ash
   // has true multi monitor support. crbug.com/119268.
@@ -84,7 +84,7 @@ class UI_EXPORT Monitor {
   int id_;
   Rect bounds_;
   Rect work_area_;
-#if defined(USE_ASH)
+#if defined(USE_AURA)
   Rect bounds_in_pixel_;
 #endif
   float device_scale_factor_;